--- a/serviceproviders/group/bld.inf Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/group/bld.inf Tue Aug 31 16:06:03 2010 +0300
@@ -17,15 +17,15 @@
#include <platform_paths.hrh>
-#include "../sapi_contacts_vpbk/group/bld.inf"
+//#include "../sapi_contacts_vpbk/group/bld.inf"
#include "../sapi_location/group/bld.inf"
#include "../sapi_mediamanagement/group/bld.inf"
#include "../sapi_landmarks/group/bld.inf"
//#include "../camera/group/bld.inf"
-#include "../sapi_messaging/group/bld.inf"
+//#include "../sapi_messaging/group/bld.inf"
-#include "../sapi_applicationmanager/group/bld.inf"
-#include "../sapi_calendar/group/bld.inf"
+//#include "../sapi_applicationmanager/group/bld.inf"
+//#include "../sapi_calendar/group/bld.inf"
#include "../sapi_logging/group/bld.inf"
#include "../sapi_sensor/group/bld.inf"
#include "../sapi_sysinfo/group/bld.inf"
--- a/serviceproviders/group/sapiincludes.mmpi Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/group/sapiincludes.mmpi Tue Aug 31 16:06:03 2010 +0300
@@ -12,8 +12,8 @@
* Contributors:
*
* Description: Sapi include path dependencies.
-* %created_by: shreedha %
-* %date_created: Wed May 12 09:52:12 2010 %
+* %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
@@ -32,7 +32,7 @@
#include <platform_paths.hrh>
SYSTEMINCLUDE /epoc32/include/icl
SYSTEMINCLUDE /epoc32/include/libc
-SYSTEMINCLUDE /epoc32/include/mmf/common
+
APP_LAYER_SYSTEMINCLUDE
--- a/serviceproviders/jsapi/platformservices/src/framework.js Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/jsapi/platformservices/src/framework.js Tue Aug 31 16:06:03 2010 +0300
@@ -85,9 +85,9 @@
nokia.device = {
load: __device_service_load,
listInterfaces: __device_service_interfaces,
- getSystemProperties: __device_getSystemProperties,
- getLibraryVersion: __device_getLibraryVersion,
- version: 2.0
+ getSystemProperties: __device_getSystemProperties,
+ getLibraryVersion: __device_getLibraryVersion,
+ version: 2.0
};
function __device_getLibraryVersion(){
--- a/serviceproviders/jsapi/platformservices/src/landmarks.js Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/jsapi/platformservices/src/landmarks.js Tue Aug 31 16:06:03 2010 +0300
@@ -15,8 +15,6 @@
*
*/
-// Namepace: com.nokia.device.service
-
var __device_landmarks_service_entry = {
"name": null,
"version": null,
--- a/serviceproviders/jsapi/platformservices/src/sensors.js Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/jsapi/platformservices/src/sensors.js Tue Aug 31 16:06:03 2010 +0300
@@ -15,9 +15,6 @@
*
*/
-
-// sensors service interface
-
var __device_sensors_service_entry = {"name": null,
"version": null,
"proto": __device_sensors,
--- a/serviceproviders/rom/serviceapi.iby Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/rom/serviceapi.iby Tue Aug 31 16:06:03 2010 +0300
@@ -39,8 +39,8 @@
file=ABI_DIR\BUILD_DIR\landmarkservice.dll SHARED_LIB_DIR\landmarkservice.dll
ECOM_PLUGIN(landmarkprovider.dll, landmarkprovider.rsc)
-file=ABI_DIR\BUILD_DIR\messagingservice.dll SHARED_LIB_DIR\messagingservice.dll
-ECOM_PLUGIN(messagingprovider.dll, messagingprovider.rsc)
+//file=ABI_DIR\BUILD_DIR\messagingservice.dll SHARED_LIB_DIR\messagingservice.dll
+//ECOM_PLUGIN(messagingprovider.dll, messagingprovider.rsc)
file=ABI_DIR\BUILD_DIR\mediamanagementservice.dll SHARED_LIB_DIR\mediamanagementservice.dll
ECOM_PLUGIN(mediamanagementprovider.dll, mediamanagementprovider.rsc)
@@ -48,16 +48,16 @@
//file=ABI_DIR\BUILD_DIR\cameraservice.dll SHARED_LIB_DIR\cameraservice.dll
//ECOM_PLUGIN(cameraprovider.dll, cameraprovider.rsc)
-file=ABI_DIR\BUILD_DIR\contactservice.dll SHARED_LIB_DIR\contactservice.dll
-ECOM_PLUGIN(contactprovider.dll, contactprovider.rsc)
+//file=ABI_DIR\BUILD_DIR\contactservice.dll SHARED_LIB_DIR\contactservice.dll
+//ECOM_PLUGIN(contactprovider.dll, contactprovider.rsc)
-file=ABI_DIR\BUILD_DIR\appmanagerservice.dll SHARED_LIB_DIR\appmanagerservice.dll
-ECOM_PLUGIN(appmanagerprovider.dll, appmanagerprovider.rsc)
+//file=ABI_DIR\BUILD_DIR\appmanagerservice.dll SHARED_LIB_DIR\appmanagerservice.dll
+//ECOM_PLUGIN(appmanagerprovider.dll, appmanagerprovider.rsc)
-file=ABI_DIR\BUILD_DIR\calendarservice.dll SHARED_LIB_DIR\calendarservice.dll
-ECOM_PLUGIN(calendarprovider.dll, calendarprovider.rsc)
+//file=ABI_DIR\BUILD_DIR\calendarservice.dll SHARED_LIB_DIR\calendarservice.dll
+//ECOM_PLUGIN(calendarprovider.dll, calendarprovider.rsc)
file=ABI_DIR\BUILD_DIR\loggingservice.dll SHARED_LIB_DIR\loggingservice.dll
ECOM_PLUGIN(loggingprovider.dll, loggingprovider.rsc)
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/testappobserver.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/testappobserver.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -76,7 +76,6 @@
iWait->AsyncStop();
- return 0;
}
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/conf/tappmanagertest.cfg Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/conf/tappmanagertest.cfg Tue Aug 31 16:06:03 2010 +0300
@@ -43,7 +43,7 @@
title LaunchApp_correctUId_synch
create tappmanagertest foobar
//scheme uid commandline doc mode postion callback expectedresult
-foobar launchApp s60uid: 0x200009ee NULL NULL NULL NULL NULL 0
+foobar launchApp s60uid: 0x101f4d90 NULL NULL NULL NULL NULL 0
delete foobar
[Endtest]
@@ -72,7 +72,7 @@
title LaunchApp_Image_commandline_synch
create tappmanagertest foobar
//scheme uid commandline doc mode postion callback expectedresult
-foobar launchApp s60uid: 0x200009ee c:\Data\Images\AppTest1.jpg NULL NULL NULL NULL 0
+foobar launchApp s60uid: 0x101f4d90 c:\Data\Images\AppTest1.jpg NULL NULL NULL NULL 0
delete foobar
[Endtest]
@@ -81,7 +81,7 @@
title LaunchApp_Image_Document_synch
create tappmanagertest foobar
//scheme uid commandline doc mode postion callback expectedresult
-foobar launchApp s60uid: 0x200009ee NULL c:\Data\Images\AppTest2.jpg NULL NULL NULL 0
+foobar launchApp s60uid: 0x101f4d90 NULL c:\Data\Images\AppTest2.jpg NULL NULL NULL 0
delete foobar
[Endtest]
@@ -99,7 +99,7 @@
title LaunchApp_Background_Manual
create tappmanagertest foobar
//scheme uid commandline doc mode postion callback expectedresult
-foobar launchApp s60uid: 0x200009ee NULL c:\Data\Images\AppTest4.jpg NULL BackGround NULL 0
+foobar launchApp s60uid: 0x101f4d90 NULL c:\Data\Images\AppTest4.jpg NULL BackGround NULL 0
delete foobar
[Endtest]
@@ -178,7 +178,7 @@
title Get_ApplicationList_Postive
create tappmanagertest foobar
//content Document MimeType ExpectedResult FileName NoOfUids
-foobar getlisttest Application NULL NULL 0 Result3 2 0x101f8543 0x10005955
+foobar getlisttest Application NULL NULL 0 Result3 2 0x100059ef 0x10005955
delete foobar
[Endtest]
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertestobserver.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -74,7 +74,6 @@
User::Leave(KErrGeneral);
iLeave = EFalse;
}
- return 0;
}
--- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappui.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappui.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -186,6 +186,5 @@
return error;
}
- return 0;
}
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrproviderblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrproviderblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -292,7 +292,7 @@
const TLiwGenericParam* p= NULL;
- CLiwIterable* iter = NULL;
+ CLiwIterable* iter;
TLiwVariant Map;
const CLiwMap* infomap;
TInt err= 0;
@@ -1410,7 +1410,7 @@
const TLiwGenericParam* p= NULL;
- CLiwIterable* iter = NULL;
+ CLiwIterable* iter;
TLiwVariant Map;
const CLiwMap* infomap;
TInt err= 0;
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/testappobserver.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/testappobserver.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -75,7 +75,7 @@
}
- return 0;
+
}
@@ -90,6 +90,4 @@
iWait = aWait;
iReason = 10 ; //Reason of failure can be either 0 or some negative valuw which incater
//error but it cant be greater than 0
- }
-
-
\ No newline at end of file
+ }
\ No newline at end of file
--- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/conf/tappmgrtest.cfg Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/conf/tappmgrtest.cfg Tue Aug 31 16:06:03 2010 +0300
@@ -56,7 +56,7 @@
[Test]
title LaunchApp_Image_viewer
create tappmgrtest foobar
-foobar launchApp s60uid: 0x200009ee NULL NULL NULL NULL NULL 0
+foobar launchApp s60uid: 0x101f4d90 NULL NULL NULL NULL NULL 0
delete foobar
[Endtest]
@@ -73,7 +73,7 @@
[Test]
title LaunchApp_JarFile
create tappmgrtest foobar
-foobar launchJar s60uid: SpruceTennis NULL NULL NULL NULL NULL -2
+foobar launchJar s60uid: SpruceTennis NULL NULL NULL NULL NULL 0
delete foobar
[Endtest]
@@ -85,7 +85,7 @@
title LaunchApp_CancellaunchAppL_1
create tappmgrtest foobar
// scheme uid commmandline doc mode postion callback expected
-foobar CancellaunchAppL s60uid: 0x200009ee NULL NULL NULL NULL Callback 0
+foobar CancellaunchAppL s60uid: 0x101f4d90 NULL NULL NULL NULL Callback 0
delete foobar
[Endtest]
--- a/serviceproviders/sapi_calendar/calendarservice/src/calendarimport.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/calendarservice/src/calendarimport.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -24,7 +24,7 @@
#include <CalenInterimUtils2.h>
#include <s32mem.h>
#include <s32file.h>
-#include <mmfcontrollerpluginresolver.h>
+
//User Include
#include "calendarheader.h"
#include "calendarconstants.h"
@@ -147,7 +147,6 @@
//
void CCalendarImport::ImportFromStreamL(RReadStream& aStream, RPointerArray<TUIDSet>& aOutputUIDArray )
{
- CleanupResetAndDestroyPushL(aOutputUIDArray);
RPointerArray<CCalEntry> outputCalEntryArray;
CleanupStack::PushL( TCleanupItem(CleanupCCalEntryArray, &outputCalEntryArray) );
@@ -183,7 +182,6 @@
}
CleanupStack::PopAndDestroy( &outputCalEntryArray );
- CleanupStack::Pop(&aOutputUIDArray);
}
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/group/tcalendaradditer3.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/group/tcalendaradditer3.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,10 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-
-
TARGET tcalendaradditer3.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -185,7 +185,7 @@
{
return KErrGeneral;
}
- if( errorcode == res )
+ if( errorcode = res )
res = KErrNone;
return res;
@@ -225,7 +225,7 @@
// __UHEAP_MARKEND;
- //return result;
+ return result;
}
TInt CTCalendarAddTest::AddApptWithWeeklyRepeat(CStifItemParser& /*aItem*/)
{
@@ -242,7 +242,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarAddTest::AddApptWithMonthlyRepeat(CStifItemParser& /*aItem*/)
{
@@ -259,7 +259,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarAddTest::AddApptWithAttendees(CStifItemParser& /*aItem*/)
{
@@ -276,7 +276,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarAddTest::AddNewAnniversary(CStifItemParser& /*aItem*/)
{
@@ -293,7 +293,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarAddTest::AddNewDayEvent(CStifItemParser& /*aItem*/)
{
@@ -310,7 +310,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarAddTest::AddNewReminder(CStifItemParser& /*aItem*/)
{
@@ -327,7 +327,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarAddTest::AddNewTodo(CStifItemParser& /*aItem*/)
{
@@ -344,7 +344,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarAddTest::AddAll(CStifItemParser& aItem)
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocksdirect.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocksdirect.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,7 +81,7 @@
int UpdateInstanceWithRepeat();
int UpdateEntryWithRepeatAndExceptionDates();
int AddEntryWithVeryLongDescription();
- TDesC GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC localuid, const TDesC& calname );
+ TDesC& GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC localuid, const TDesC& calname );
CTestSync();
~CTestSync();
@@ -1304,7 +1304,7 @@
}
-TDesC CTestSync::GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname)
+TDesC& CTestSync::GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname)
{
inparam->Reset();
outparam->Reset();
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/group/tcalendarchangenotifyiter3.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/group/tcalendarchangenotifyiter3.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,8 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendarchangenotifyiter3.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/group/tcalendardeleteiter3.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/group/tcalendardeleteiter3.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,8 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendardeleteiter3.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/delete.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/delete.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -59,7 +59,7 @@
CLiwGenericParamList& aEventParamList,
const CLiwGenericParamList& aInParamList)
{
- TInt32 errCode = 0;
+ TInt32 errCode;
TInt pos = 0;
// Traiverse the List and Fill in the Log Files
@@ -313,7 +313,7 @@
{
TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam));
const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code
- TInt errCode = 0;
+ TInt errCode;
if( p )
{
errCode = p->Value().AsTInt32();
@@ -387,7 +387,6 @@
iResult = errCode;
return errCode;
}
- return 0;
}
@@ -568,7 +567,7 @@
filterMap->InsertL(KCalendarName,TLiwVariant(_L("C:Calendar")));
TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam/*, KLiwOptASyncronous, iCallback*/));
- TInt errCode = 0;
+ TInt errCode;
const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code
if( p )
{
@@ -625,7 +624,7 @@
filterMap->InsertL(KCalendarName,TLiwVariant(_L("C:CalendarFileZ")));
TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam/*, KLiwOptASyncronous, iCallback*/));
- TInt errCode = 0;
+ TInt errCode;
const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code
if( p )
{
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteguid.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteguid.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -297,7 +297,7 @@
{
TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam));
const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code
- TInt errCode = 0;
+ TInt errCode;
if( p )
{
errCode = p->Value().AsTInt32();
@@ -373,10 +373,9 @@
CTestAsyncGuid* test = CTestAsyncGuid::NewL();
int res = test->Start(flag, async);
delete test;
- __UHEAP_MARKEND;
return res;
-
+ __UHEAP_MARKEND;
}
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteluid.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteluid.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -59,7 +59,7 @@
CLiwGenericParamList& aEventParamList,
const CLiwGenericParamList& aInParamList)
{
- TInt32 errCode = 0;
+ TInt32 errCode;
TInt pos = 0;
// Traiverse the List and Fill in the Log Files
@@ -305,7 +305,7 @@
{
TRAPD(err1 ,interface->ExecuteCmdL(KCmd, *inparam, *outparam));
const TLiwGenericParam* p = outparam->FindFirst(pos, KErrorCode); // Finding Error Code
- TInt errCode = 0;
+ TInt errCode;
if( p )
{
errCode = p->Value().AsTInt32();
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/group/tcalendarexportiter3.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/group/tcalendarexportiter3.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,8 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendarexportiter3.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/group/tcalendargenerictest.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/group/tcalendargenerictest.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -23,8 +23,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendargenerictest.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertestobserver.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -69,7 +69,6 @@
if(iWait)
iWait->AsyncStop();
- return 0;
}
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/group/tcalendargetlistiter3.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/group/tcalendargetlistiter3.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,8 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendargetlistiter3.dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttestblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttestblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -43,7 +43,7 @@
void GetLocalUid( const TDesC& aLocalUid, TCalLocalUid& aOutLocalUid );
void GetGlobalUid( const TDesC& aGlobalUid, TDes8& aOutGlobalUid );
-TDesC GetEntry(MLiwInterface* interface, CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname);
+TDesC& GetEntry(MLiwInterface* interface, CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname);
class CCalGetListCallback : public MLiwNotifyCallback
{
@@ -1988,7 +1988,7 @@
aOutGlobalUid.Copy( aGlobalUid );
}
-TDesC GetEntry(MLiwInterface* interface, CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname)
+TDesC& GetEntry(MLiwInterface* interface, CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname)
{
inparam->Reset();
outparam->Reset();
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/group/tcalendarimportiter3.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/group/tcalendarimportiter3.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,8 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendarimportiter3.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/group/tcalendarupdateiter3.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/group/tcalendarupdateiter3.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,8 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendarupdateiter3.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetestblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetestblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,7 +81,7 @@
int UpdateTodoEntryWithGlobalIdL();
int UpdateAppointmentEntryWithNewTimeAndGlobalIdL();
- TDesC GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname);
+ TDesC& GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname);
CTestUpdateSync();
~CTestUpdateSync();
@@ -197,7 +197,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithNewTimeL(CStifItemParser& /*aItem*/)
@@ -215,7 +215,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithNewAttendeesL(CStifItemParser& /*aItem*/)
@@ -233,7 +233,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
@@ -252,7 +252,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarUpdateTest::UpdateDayEventL(CStifItemParser& /*aItem*/)
@@ -270,7 +270,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarUpdateTest::UpdateReminderL(CStifItemParser& /*aItem*/)
@@ -288,7 +288,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarUpdateTest::UpdateTodoEntryL(CStifItemParser& /*aItem*/)
{
@@ -305,7 +305,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithNewRepeatL(CStifItemParser& /*aItem*/)
@@ -323,7 +323,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithGlobalIdL(CStifItemParser& /*aItem*/)
{
@@ -340,7 +340,7 @@
// __UHEAP_MARKEND;
-// return result;
+ return result;
}
TInt CTCalendarUpdateTest::UpdateAnniversaryWithGlobalIdL(CStifItemParser& /*aItem*/)
@@ -358,7 +358,7 @@
// __UHEAP_MARKEND;
- //return result;
+ return result;
}
TInt CTCalendarUpdateTest::UpdateDayEventWithGlobalIdL(CStifItemParser& /*aItem*/)
@@ -376,7 +376,7 @@
// __UHEAP_MARKEND;
- //return result;
+ return result;
}
TInt CTCalendarUpdateTest::UpdateReminderWithGlobalIdL(CStifItemParser& /*aItem*/)
@@ -394,7 +394,7 @@
// __UHEAP_MARKEND;
- //return result;
+ return result;
}
TInt CTCalendarUpdateTest::UpdateTodoEntryWithGlobalIdL(CStifItemParser& /*aItem*/)
{
@@ -411,7 +411,7 @@
// __UHEAP_MARKEND;
- //return result;
+ return result;
}
TInt CTCalendarUpdateTest::UpdateAppointmentEntryWithNewTimeAndGlobalIdL(CStifItemParser& /*aItem*/)
{
@@ -428,7 +428,7 @@
// __UHEAP_MARKEND;
- //return result;
+ return result;
}
TInt CTestUpdateSync::UpdateAppointmentEntryL()
@@ -2655,7 +2655,7 @@
}
-TDesC CTestUpdateSync::GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname)
+TDesC& CTestUpdateSync::GetEntry(CLiwGenericParamList* inparam, CLiwGenericParamList* outparam, TPtrC globaluid, const TDesC& calname)
{
inparam->Reset();
outparam->Reset();
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/group/tcalendaradditer1.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/group/tcalendaradditer1.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,8 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendaradditer1.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/group/tcalendarchangenotifyiter1.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/group/tcalendarchangenotifyiter1.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,8 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendarchangenotifyiter1.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/group/tcalendardeleteiter1.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/group/tcalendardeleteiter1.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,8 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendardeleteiter1.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/group/tcalendarexportiter1.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/group/tcalendarexportiter1.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,8 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendarexportiter1.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/group/tcalendargetlistiter1.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/group/tcalendargetlistiter1.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,8 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendargetlistiter1.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/calgetlisttestcases.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/calgetlisttestcases.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -180,7 +180,7 @@
}
CCalGetlistTestCases::CCalGetlistTestCases( TInt& aResult, TBool aEntryArray) : CActive(EPriorityStandard), iResult(aResult),
- iEntryArray(aEntryArray),iTestCaseType(KGetlistGuidFilterAsync)
+ iEntryArray(aEntryArray)
{
}
@@ -194,9 +194,9 @@
_LIT(KSearchTexttest ,"Meeting");
void CCalGetlistTestCases::RunL()
{
- CCalendarFilter *filter = NULL;
+ CCalendarFilter *filter;
- CEntryAttributes* entryObj = NULL;
+ CEntryAttributes* entryObj;
RPointerArray<TUIDSet> arruids(5);
TUIDSet* uids = NULL;
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/group/tcalendarimportiter1.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/group/tcalendarimportiter1.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,8 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendarimportiter1.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/group/tcalendarupdateiter1.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/group/tcalendarupdateiter1.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -22,8 +22,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcalendarupdateiter1.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -39,8 +39,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcal_providertest.dll
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertestblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertestblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -3664,7 +3664,7 @@
TInt pos = 0 ;
const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode"));
- TInt32 err = 0;
+ TInt32 err;
if(output)
{
err = output->Value().AsTInt32();
@@ -3707,7 +3707,7 @@
TInt pos = 0 ;
const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode"));
- TInt32 err = 0;
+ TInt32 err;
if(output)
{
err = output->Value().AsTInt32();
@@ -3776,7 +3776,7 @@
const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode"));
cells = User::CountAllocCells();
- TInt32 err = 0;
+ TInt32 err;
if(output)
{
err = output->Value().AsTInt32();
@@ -3963,7 +3963,7 @@
const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode"));
cells = User::CountAllocCells();
- TInt32 err = 0;
+ TInt32 err;
if(output)
{
err = output->Value().AsTInt32();
@@ -4041,7 +4041,7 @@
const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode"));
cells = User::CountAllocCells();
- TInt32 err = 0;
+ TInt32 err;
if(output)
{
err = output->Value().AsTInt32();
@@ -4119,7 +4119,7 @@
const TLiwGenericParam* output = outparam->FindFirst( pos,_L8("ErrorCode"));
cells = User::CountAllocCells();
- TInt32 err = 0;
+ TInt32 err;
if(output)
{
err = output->Value().AsTInt32();
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -38,8 +38,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcal_add.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -38,8 +38,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcal_changenotify.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -38,8 +38,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/cal_delete.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/cal_delete.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -586,8 +586,7 @@
iWaitSchedular = new(ELeave) CActiveSchedulerWait();
}
-CCalDelTestCases::CCalDelTestCases( TInt& aResult) : CActive(EPriorityStandard),
- iResult(aResult),iTestCaseType(KDeleteUsingGuidsAsync)
+CCalDelTestCases::CCalDelTestCases( TInt& aResult) : CActive(EPriorityStandard), iResult(aResult)
{
}
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -38,8 +38,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcal_export.dll
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -38,8 +38,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/calgetlisttestcases.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/calgetlisttestcases.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -180,7 +180,7 @@
}
CCalGetlistTestCases::CCalGetlistTestCases( TInt& aResult, TBool aEntryArray) : CActive(EPriorityStandard), iResult(aResult),
- iEntryArray(aEntryArray),iTestCaseType( KGetlistGuidFilterAsync )
+ iEntryArray(aEntryArray)
{
}
@@ -194,9 +194,9 @@
_LIT(KSearchTexttest ,"Meeting");
void CCalGetlistTestCases::RunL()
{
- CCalendarFilter *filter = NULL;
+ CCalendarFilter *filter;
- CEntryAttributes* entryObj = NULL;
+ CEntryAttributes* entryObj;
RPointerArray<TUIDSet> arruids(5);
TUIDSet* uids = NULL;
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlistblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlistblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -199,7 +199,7 @@
// TInt Noofitems = allCalendarNames->Count();
- CCalendarService* service = NULL;
+ CCalendarService* service ;
TRAPD(err_one,service = CCalendarService::NewL());
@@ -276,7 +276,7 @@
// CDesCArray* allCalendarNames;
- CCalendarService* service = NULL;
+ CCalendarService* service ;
TRAPD(err_one,service = CCalendarService::NewL());
@@ -370,7 +370,7 @@
// TInt Noofitems;
- CCalendarService* service = NULL;
+ CCalendarService* service ;
TRAPD(err_one,service = CCalendarService::NewL());
@@ -414,7 +414,7 @@
// CDesCArray* allCalendarNames;
- CCalendarService* service = NULL;
+ CCalendarService* service ;
TRAPD(err_one,service = CCalendarService::NewL());
@@ -521,7 +521,7 @@
CDesCArray *allCalendarNames = NULL;
- CCalendarService* service = NULL;
+ CCalendarService* service ;
TRAPD(err_one,service = CCalendarService::NewL());
@@ -575,7 +575,7 @@
{
__UHEAP_MARK;
TInt result = KErrNone;
- TInt result_one = KErrNone;
+ TInt result_one;
TInt result_two = KErrNone;
TInt result_three = KErrNone;
TInt result_four = KErrNone;
@@ -595,7 +595,7 @@
RPointerArray<CCalEntry> entryArray(1);
TUIDSet* uids = NULL;
- CCalendarService* service = NULL;
+ CCalendarService* service ;
TRAPD(err_one,service = CCalendarService::NewL());
RemoveCalendarFile( service, KTestCal1File );
@@ -653,7 +653,7 @@
result_two = err_three;
- TRAPD( err_four, service->GetListL( KTestCal1File, 2000000, entryArray ));
+ TRAPD( err_four, service->GetListL( KTestCal1File, -2000000, entryArray ));
if ( err_four == KErrNone )
{
if(entryArray.Count())
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -38,8 +38,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcal_import.dll
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/importestcases.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/importestcases.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -796,7 +796,7 @@
// Import with invalid luid
new_expParams->AddLocalUid( 10000 );
- new_expParams->AddLocalUid( 3000 );
+ new_expParams->AddLocalUid( -3000 );
new_expParams->SetExportFileNameL(KVcalImportGuidsFile);
delete buffer;
buffer = NULL;
@@ -1153,7 +1153,7 @@
}
CCalImpTestCases::CCalImpTestCases( TInt& aResult, TInt aVCalOrICal): CActive(EPriorityStandard), iResult(aResult) ,
- iVCalOrICal(aVCalOrICal) ,iTestCaseType (KImportGuidAsync)
+ iVCalOrICal(aVCalOrICal)
{
}
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -38,8 +38,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tcal_update.dll
--- a/serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group/tcalprovider_combined.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalprovider_combined/group/tcalprovider_combined.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -30,8 +30,7 @@
* Description: ?Description
*
*/
-MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
+
#include "../../../../../group/sapiincludes.mmpi"
TARGET tcalprovider_combined.dll
--- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/singlecontactfield.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/singlecontactfield.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -18,7 +18,7 @@
#include <MVPbkFieldType.h>
#include <MVPbkContactFieldTextData.h>
-#include <mmfcontrollerpluginresolver.h>
+
#include "singlecontact.h"
#include "singlecontactfield.h"
@@ -143,7 +143,6 @@
EXPORT_C void CSingleContactField::GetUriFieldParamL(RPointerArray<HBufC>& axspidArray)
{
- CleanupResetAndDestroyPushL(axspidArray);
TInt count = iidArray.Count();
if(count != 0)
{
@@ -156,8 +155,7 @@
else
{
User::Leave(KErrNotFound);
- }
- CleanupStack::Pop(&axspidArray);
+ }
}
//Gets the Group Data and returns them as output parameters
@@ -235,7 +233,6 @@
EXPORT_C void CSingleContactField::GetXspidDataL(RPointerArray<HBufC>& axspidArray)
{
- CleanupResetAndDestroyPushL(axspidArray);
TInt count = iArrayValue.Count();
if(count != 0)
{
@@ -250,8 +247,7 @@
else
{
User::Leave(KErrNotFound);
- }
- CleanupStack::Pop(&axspidArray);
+ }
}
CSingleContactField::~CSingleContactField()
{
--- a/serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -406,12 +406,7 @@
//iDburi = HBufC::NewL(VPbkContactStoreUris::DefaultCntDbUri().Length());
//set the DBUri to the default value.
//iDburi->Des().Copy(VPbkContactStoreUris::DefaultCntDbUri());
- if(iDburi)
- {
- delete iDburi;
- iDburi=NULL;
- }
- iDburi = GetDefaultDBUri().AllocL();
+ iDburi = GetDefaultDBUri().AllocLC();
//get the number of entries in the map
TInt keyCount = aMap->Count();
@@ -1783,7 +1778,7 @@
User::Leave(err);
}
}
- //CleanupStack::Pop();
+ CleanupStack::Pop();
CleanupStack::Pop(contact);
} //end of if pMap
else
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcompluginblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcompluginblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -295,7 +295,7 @@
if(iCase == EModifyContactComplete)
{
//call the get list once again to check whether the contact is modified
- CStifItemParser* stiff = NULL;
+ CStifItemParser* stiff;
iCase = EModifyContactVerify;
//this time call the getlist with the contact id to get only the modified contact
GetContactALL(*stiff);
@@ -576,7 +576,7 @@
else if(aEventId == KLiwEventCompleted && code == KErrNone )
{
iCase = EVerifyGroupAdd;
- CStifItemParser* stiff = NULL;
+ CStifItemParser* stiff;
iIdArrayList.ResetAndDestroy();
GetGroup(*stiff);
}
@@ -610,7 +610,7 @@
else if(aEventId == KLiwEventCompleted && code == KErrNone )
{
iCase = EVerifyImport;
- CStifItemParser* stiff = NULL;
+ CStifItemParser* stiff;
GetContactALL(*stiff);
}
else
@@ -623,7 +623,7 @@
if(aEventId == KLiwEventCompleted && code == KErrNone )
{
iCase = EVerifyOrganizeDelete;
- CStifItemParser* stiff = NULL;
+ CStifItemParser* stiff;
iIdArrayList.ResetAndDestroy();
GetGroup(*stiff);
}
@@ -714,7 +714,7 @@
if(firstName.CompareF(_L("Barbie")) != 0)
{
iResult = KErrGeneral;
- return 0;
+ return;
}
if(map->FindL(KSecondName,mapfield))
@@ -725,7 +725,7 @@
if(secName.CompareF(_L("Doll")) != 0)
{
iResult = KErrGeneral;
- return 0;
+ return;
}
if(map->FindL(KCallerObjImg,mapfield))
@@ -736,7 +736,7 @@
if(callerObjImg.CompareF(_L("C:\\data\\images\\pic.jpg")) != 0)
{
iResult = KErrGeneral;
- return 0;
+ return;
}
if(map->FindL(KNote,mapfield))
mapField = mapfield.AsMap();
@@ -746,7 +746,7 @@
if(Note.CompareF(_L("Lead role in Barbie, the island princess")) != 0)
{
iResult = KErrGeneral;
- return 0;
+ return;
}
if(map->FindL(KXSPID,mapfield))
@@ -763,7 +763,7 @@
if(ptrVal.CompareF(_L("Yahoo:Barbie@yahoo.co.in")) != 0 && ptrVal.CompareF(_L("Google:Barbie@gmail.com")) != 0)
{
iResult = KErrGeneral;
- return 0;
+ return;
}
}
}
@@ -775,7 +775,6 @@
iResult = code;
}
}
- return 0;
}
void CTestProvider::LoadService()
@@ -1401,7 +1400,7 @@
}
TInt CTestProvider :: ModifyGroup(CStifItemParser& /*aItem*/)
- { return 0;
+ {
}
TInt CTestProvider :: ExportL( CStifItemParser& aItem )
@@ -1996,14 +1995,14 @@
*/
TInt CTestProvider :: ModifyContactPosBased(CStifItemParser& /*aItem*/)
{
- return 0;
+
}
/**
* Math operation BearingTo Test
*/
TInt CTestProvider ::ModifyGroupPosBased(CStifItemParser& /*aItem*/)
- { return 0;
+ {
}
TInt CTestProvider :: ExportPosBased(CStifItemParser& aItem)
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -23,7 +23,7 @@
#include <StifParser.h>
#include <StifTestInterface.h>
#include <VPbkEng.rsg>
-#include <mmfcontrollerpluginresolver.h>
+
#include <MVPbkContactFieldTextData.h>
#include <MVPbkContactStoreList.h>
#include <MVPbkContactOperationBase.h>
@@ -112,11 +112,7 @@
}
void CContactsUT::HandleReturnId( const TInt& aError, HBufC8* acntId, TInt aTransId )
{
- delete acntId;
CActiveScheduler::Stop();
- if(aError == KErrNone)
- iErr = KErrNone;
-
}
void CContactsUT::HandleReturnArray(const TInt& aError, RPointerArray<HBufC8>& aArray, TInt aTransId )
@@ -207,11 +203,10 @@
iLog->Log(_L("Phone Contact Field modified \n"));
__UHEAP_MARK;
iServiceHandle->AddL(this,0,singleContact);
- __UHEAP_MARKEND;
-
iLog->Log(_L("AddL called\n"));
iLog->Log(_L("Start Active Scheduler\n"));
CActiveScheduler::Start();
+ __UHEAP_MARKEND;
break;
}
}
@@ -665,7 +660,7 @@
iErr = KErrNone;
- // __UHEAP_MARK;
+ __UHEAP_MARK;
iOp = iContactManager->MatchPhoneNumberL(
KPhoneNumber, KPhoneNumber().Length(), *this );
CActiveScheduler::Start();
@@ -691,7 +686,7 @@
iContactToDelete = NULL;
- // __UHEAP_MARKEND;
+ __UHEAP_MARKEND;
}
//Add 1 contact
@@ -745,8 +740,7 @@
//Check for contact
void CContactsUT::CheckContactsL(TInt& aCount,RPointerArray<TDesC8>& aIdArray)
- {
- CleanupResetAndDestroyPushL(aIdArray);
+ {
// Print to UI
_LIT( KContactsTest, "ContactsUT" );
_LIT( KExample, "In CheckContactsL" );
@@ -772,8 +766,7 @@
}
delete iFindResults;
iFindResults = NULL;
- // __UHEAP_MARKENDC(aCount);
- CleanupStack::Pop(&aIdArray);
+ // __UHEAP_MARKENDC(aCount);
}
// -----------------------------------------------------------------------------
@@ -3161,7 +3154,7 @@
{
while(count)
{
- __UHEAP_MARK;
+ //__UHEAP_MARK;
iBuffer = (const_cast<MVPbkContactLink&>(iFindResults->At(--count))).PackLC();
CleanupStack::Pop();//iBuffer
iServiceHandle = CContactService::NewL();
@@ -3176,7 +3169,7 @@
delete iServiceHandle;//serviceHandle
iServiceHandle = NULL;
iLog->Log( KServiceClose );
- __UHEAP_MARKEND;
+ //__UHEAP_MARKEND;
}
}
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -23,7 +23,7 @@
#include <StifParser.h>
#include <StifTestInterface.h>
#include <VPbkEng.rsg>
-#include <mmfcontrollerpluginresolver.h>
+
#include <MVPbkContactFieldTextData.h>
#include <MVPbkContactStoreList.h>
#include <MVPbkContactOperationBase.h>
@@ -582,8 +582,7 @@
//Check for contact
void CContactsUT::CheckContactsL(TInt& aCount,RPointerArray<TDesC8>& aIdArray)
- {
- CleanupResetAndDestroyPushL(aIdArray);
+ {
// Print to UI
_LIT( KContactsTest, "ContactsUT" );
_LIT( KExample, "In CheckContactsL" );
@@ -609,8 +608,7 @@
}
delete iFindResults;
iFindResults = NULL;
- // __UHEAP_MARKENDC(aCount);
- CleanupStack::Pop(&aIdArray);
+ // __UHEAP_MARKENDC(aCount);
}
// -----------------------------------------------------------------------------
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -168,7 +168,6 @@
User::Leave(KErrNotFound);
}
} */
- return 0;
}
TInt Ctcontactsgetidsprovidertest::AddL( CStifItemParser& aItem )
{
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim_blocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim_blocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -417,7 +417,7 @@
file.Flush();
file.Close();
CleanupStack::PopAndDestroy();
- return 0;
+
}
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk_observer.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk_observer.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -73,7 +73,7 @@
}
- return 0;
+
}
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_addblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_addblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -158,7 +158,7 @@
TPtrC value(KNullDesC);
//CContactCallback* callbk=new(ELeave) CContactCallback;
TPtr8 cntIdPtrVal(acntId->Des());
- CContactIter* iterVal = NULL;
+ CContactIter* iterVal;
TRAPD(err, iterVal = cntservice->GetListL(EContacts,cntIdPtrVal));
if(err != KErrNone)
{
@@ -967,7 +967,7 @@
aItem.GetNextInt(count) ;
/*Add group1 to phonebook */
- TInt err1 = 0;
+ TInt err1;
TRAPD(err,icontactservice->AddL(icallback,0,singleContact,KNullDesC8,KGroup));
if(err || err1)
{
@@ -1361,7 +1361,7 @@
icontactservice=CContactService::NewL();
/* Add the contactitem */
- HBufC8* cntId = NULL;
+ HBufC8* cntId;
TRAPD(error,cntId= icontactservice->AddL(singleContact));
@@ -1441,7 +1441,7 @@
// Print to log file
iLog->Log( KExample );
- HBufC8* grpId = NULL;
+ HBufC8* grpId;
TInt count;
/* Group1 to add to phonebook */
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_deleteblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_deleteblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -909,8 +909,7 @@
CleanupClosePushL(idArray);
//idArray.AppendL(contactId);
- TInt err1 = 0;
- TInt err2 = 0;
+ TInt err1,err2;
TRAP(err1,icontactservice->DeleteL(icallback,0,idArray));
if (err1 || err2)
{
@@ -963,8 +962,7 @@
CleanupClosePushL(idArray);
//idArray.AppendL(contactId);
- TInt err1 = 0;
- TInt err2 = 0;
+ TInt err1,err2;
TRAP(err1,icontactservice->DeleteL(icallback,0,idArray));
if(err1 || err2)
{
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_exportblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_exportblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -197,8 +197,7 @@
TInt flag=0,cnt=0;
/*call getlist to get the contactid for export */ \
- TInt err1 = 0;
- TInt err2 = 0;
+ TInt err1, err2;
TRAP(err1,icontactservice->GetListL(icallback,1,EContacts,KNullDesC8));
CActiveScheduler::Start();
@@ -213,11 +212,10 @@
/* verify whther export returns the expected error */
aItem.GetNextInt(flag) ;
if(icallback->iError)
- return KErrNone;
+ return KErrNone;
if(icallback->iError == flag)
- return KErrNone;
+ return KErrNone;
- return 0;
}
/* exporting 2 contacts */
--- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlistblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlistblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -365,11 +365,11 @@
delete icontactservice;
__UHEAP_MARKEND;
return KErrNone ;
- // delete icallback;
- //delete icontactservice;
- //__UHEAP_MARKEND;
+ delete icallback;
+ delete icontactservice;
+ __UHEAP_MARKEND;
- //return KErrGeneral;
+ return KErrGeneral;
}
@@ -619,6 +619,10 @@
CContactIter* iter = CContactIter::NewL();
icontactservice->GetListL(*iter);
+ delete iter;
+ delete icallback;
+ delete icontactservice;
+ __UHEAP_MARKEND;
TPtrC buf(_L(""));
iter->NextL(buf);
@@ -627,15 +631,16 @@
{ count++;
iter->NextL(buf);
}
- delete iter;
- delete icallback;
- delete icontactservice;
- __UHEAP_MARKEND;
+ if(count==2)
+ {
- if(count==2)
return KErrNone ;
- else
- return KErrGeneral;
+ }
+delete iter;
+ delete icallback;
+ delete icontactservice;
+ //__UHEAP_MARKEND;
+ return KErrGeneral;
}
/* get all contacts from the phonebook ie contacts.cdb,manual*/
@@ -729,7 +734,7 @@
_LIT( KLog4, "before calling add" );
iLog->Log( KLog4 );
/* Add the contactitem */
- HBufC8* cntId = NULL;
+ HBufC8* cntId;
TRAPD(err,cntId= icontactservice->AddL(singleContact));
TPtr8 cntIdPtrVal(cntId->Des());
@@ -914,7 +919,7 @@
// aItem.GetNextInt(count) ;
/* Add the contactitem */
- HBufC8* cntId = NULL;
+ HBufC8* cntId;
TRAPD(err,cntId= icontactservice->AddL(singleContact));
TPtr8 cntIdPtrVal(cntId->Des());
@@ -936,7 +941,7 @@
return KErrGeneral ;
}
newFields = ETrue;
- CContactIter* iterVal = NULL;
+ CContactIter* iterVal;
TPtr8 cntIdPtr(cntId->Des());
TRAPD(error, iterVal = icontactservice->GetListL(EContacts,cntIdPtr));
--- a/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkdummyao.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkdummyao.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -74,20 +74,20 @@
}
else*/
//{
- switch(iCmd)
- {
- case EAdd: TRAP_IGNORE(iObserver->HandleAddItemsL(iId,iTransactionId,iStatus.Int()));
- break;
- case EUpdate:
- case ERemove: TRAP_IGNORE(iObserver->HandleItemsL(iTransactionId,iStatus.Int()));
- break;
- default:
- break;
- }
-
- if (!iManageObjects->IsActive())
- {
- iManageObjects->Start();
+ switch(iCmd)
+ {
+ case EAdd: TRAP_IGNORE(iObserver->HandleAddItemsL(iId,iTransactionId,iStatus.Int()));
+ break;
+ case EUpdate:
+ case ERemove: TRAP_IGNORE(iObserver->HandleItemsL(iTransactionId,iStatus.Int()));
+ break;
+ default:
+ break;
+ }
+
+ if (!iManageObjects->IsActive())
+ {
+ iManageObjects->Start();
}
// }
}
--- a/serviceproviders/sapi_landmarks/src/landmarkinterface.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_landmarks/src/landmarkinterface.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -946,12 +946,11 @@
landmarkIdArray.AppendL (lmid );
}
}
- TBuf<256> dbUri;
-
+ TPtrC dbUri;
if (ValidateParamL (KExport, KDbUri, exportData, LIW::EVariantTypeDesC,
EFalse, variant ) )
{
- dbUri.Append(variant.AsDes ( ) );
+ dbUri.Set (variant.AsDes ( ) );
}
ValidateParamL (KExport, KMimeType, exportData, LIW::EVariantTypeDesC,
ETrue, variant );
--- a/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/src/landmarks_inputparamsblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_landmarks/tsrc/dev/landmarks_inputparams/src/landmarks_inputparamsblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -1220,7 +1220,7 @@
variant.Reset();
var.Reset();
}
- return 0;
+
}
TInt Clandmarks_inputparams::CheckDescending(TType aType, CLiwIterable* aIter)
@@ -1253,7 +1253,7 @@
variant.Reset();
var.Reset();
}
- return 0;
+
}
// ========================== OTHER EXPORTED FUNCTIONS =========================
// None
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tgetlist.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tgetlist.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -94,7 +94,6 @@
{
iWaitSchedular->AsyncStop();
}
- return 0;
}
CTestAsync* CTestAsync::NewL(TInt type)
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_providerblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_providerblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -4256,7 +4256,7 @@
TLiwGenericParam param;
TInt index = 0;
- CActiveSchedulerWait* WaitSchedular = NULL;
+ CActiveSchedulerWait* WaitSchedular;
CLiwMap* landmarkMap = CLiwDefaultMap::NewL();
TInt32 test_val = KErrGeneral;
--- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tprovidertestobserver.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -76,7 +76,6 @@
if(iWait)
iWait->AsyncStop();
- return 0;
}
--- a/serviceproviders/sapi_location/locationservice/src/locationcoreimp.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/locationservice/src/locationcoreimp.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -172,7 +172,7 @@
// If position server could not get position
// In two minutes it will terminate the position request
- // updateopts.SetUpdateTimeOut(TTimeIntervalMicroSeconds(KSUpdateTimeOut));
+ //updateopts.SetUpdateTimeOut(TTimeIntervalMicroSeconds(KSUpdateTimeOut));
// Positions which have time stamp below KMaxAge can be reused
updateopts.SetMaxUpdateAge(TTimeIntervalMicroSeconds(KSMaxAge));
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -218,7 +218,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val = 0;
+ TInt Val ;
//Install a new active scheduler to this thread
TRAPD(err ,( Val = TraceTOL()) );
delete cleanup ;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -2200,7 +2200,7 @@
outputlist->Reset() ;
inputlist->Reset() ;
- ASyncLocCBF* callBack = NULL;
+ ASyncLocCBF* callBack ;
locinterface->ExecuteCmdL(CmdBuf , *inputlist , *outputlist,KLiwOptASyncronous, callBack);
@@ -2958,9 +2958,9 @@
_LIT8(KService, "Service.Location");
_LIT8(KIDataSource,"ILocation");
- __UHEAP_MARKEND ;
+
return KErrNone ; //Manual test case
- /*CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL();
+ CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL();
// Input and output parameter list
CLiwGenericParamList* inputlist = &(ServiceHandler->InParamListL());
@@ -3041,9 +3041,9 @@
delete ServiceHandler ;
a.ResetAndDestroy() ;
- // delete OutParmList ;*/
-
- //return result ;
+ // delete OutParmList ;
+ __UHEAP_MARKEND ;
+ return result ;
}
@@ -3063,7 +3063,7 @@
iLog->Log(KTLocTest) ;
return KErrNone ; //Manual test case
- /*TRequestStatus Status = KRequestPending ;
+ TRequestStatus Status = KRequestPending ;
RThread FunctionThread ;
TInt ret = FunctionThread.Create(_L("ServiceFailed Thread") , ServiceFailedTest ,KDefaultStackSize ,
@@ -3091,7 +3091,7 @@
}
- return ret; */
+ return ret;
}
@@ -3229,7 +3229,7 @@
}
return KErrNone ;
- //return KErrGeneral;
+ return KErrGeneral;
}
@@ -3575,7 +3575,7 @@
iLog->Log(KTLocTest) ;
return KErrNone ; //This is a manul test case
- /*CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL();
+ CLiwServiceHandler* ServiceHandler = CLiwServiceHandler::NewL();
// Input and output parameter list
CLiwGenericParamList* inputlist = &(ServiceHandler->InParamListL());
@@ -3658,7 +3658,7 @@
_LIT(Kerr , "Time out value not set correctly") ;
return KErrNone ;
- */
+
}
/**
@@ -6511,7 +6511,7 @@
outputlist->Reset() ;
inputlist->Reset() ;
- ASyncLocCBF* callBack = NULL;
+ ASyncLocCBF* callBack ;
locinterface->ExecuteCmdL(CmdBuf , *inputlist , *outputlist,KLiwOptASyncronous, callBack);
@@ -6795,7 +6795,7 @@
TInt CTestProvider::GetLocPosBasedWrongVal1(CStifItemParser& /*aItem*/)
{
//currently not needed
- return 0;
+
}
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tconcurrentgetlocation.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tconcurrentgetlocation.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -173,7 +173,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val = 0;
+ TInt Val ;
//Install a new active scheduler to this thread
TRAPD(err ,( Val = ConcurrentGetLocCallsL()) );
delete cleanup ;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -299,7 +299,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val = 0;
+ TInt Val ;
TInt *flag = static_cast<TInt *>(aFlag);
TInt err;
//Install a new active scheduler to this thread
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationasync.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationasync.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -700,7 +700,7 @@
//TInt start = User::CountAllocCells();
ASyncLocCB MyUpdates ;
- TInt errRet = 0;
+ TInt errRet;
_LIT8(KService, "Service.Location");
_LIT8(KIDataSource,"ILocation");
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationcancel.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationcancel.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -39,7 +39,7 @@
CLiwGenericParamList& aEventParamList,
const CLiwGenericParamList& aInParamList)
{
- return 0;
+
}
GetLoctionCancel() : iRetStatus(KErrGeneral) //Default constructor
@@ -151,7 +151,7 @@
{
// __UHEAP_MARK;
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt val = 0;
+ TInt val ;
TRAPD(err , (val = GetLocCancelL() ) ) ;
delete cleanup ;
// __UHEAP_MARKEND;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocwrongcancel.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocwrongcancel.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -38,7 +38,7 @@
CLiwGenericParamList& aEventParamList,
const CLiwGenericParamList& aInParamList)
{
- return 0;
+
}
WrongNotificationGetLoc() : iRetStatus(KErrGeneral) //Default constructor
@@ -153,7 +153,7 @@
{
// __UHEAP_MARK;
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt val = 0;
+ TInt val ;
TRAPD(err , (val = GetLocWrongCancelL() ) ) ;
delete cleanup ;
// __UHEAP_MARKEND;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tservicefailedtest.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tservicefailedtest.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -56,7 +56,7 @@
TInt Index = 0 ;
const TLiwGenericParam *GenericParam = aEventParamList.FindFirst(Index , KErrorCode );
- TInt error = 0;
+ TInt error ;
if(GenericParam)
{
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tstraysignaltest.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tstraysignaltest.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -291,9 +291,9 @@
{
return err ;
}
- else
+
return val ;
-
+ return 0 ;
}
\ No newline at end of file
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttraceconcurrentcalls.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttraceconcurrentcalls.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -206,7 +206,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val = 0;
+ TInt Val ;
//Install a new active scheduler to this thread
TRAPD(err ,( Val = TraceConcurrentCallsL()) );
delete cleanup ;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocationcancel.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocationcancel.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -38,7 +38,7 @@
CLiwGenericParamList& aEventParamList,
const CLiwGenericParamList& aInParamList)
{
- return 0;
+
}
TraceLoctionCancel() : iRetStatus(KErrGeneral) //Default constructor
@@ -150,7 +150,7 @@
{
// __UHEAP_MARK;
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt val = 0;
+ TInt val ;
TRAPD(err , (val = TraceLocCancelL() ) ) ;
delete cleanup ;
// __UHEAP_MARKEND;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocwrongcancel.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocwrongcancel.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -38,7 +38,7 @@
CLiwGenericParamList& aEventParamList,
const CLiwGenericParamList& aInParamList)
{
- return 0;
+
}
WrongNotificationTraceLoc() : iRetStatus(KErrGeneral) //Default constructor
@@ -158,7 +158,7 @@
{
// __UHEAP_MARK;
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt val = 0;
+ TInt val ;
TRAPD(err , (val = TraceLocWrongCancelL() ) ) ;
delete cleanup ;
// __UHEAP_MARKEND;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tfunctionthread.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tfunctionthread.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -350,7 +350,7 @@
TInt ServiceFailedTest(TAny */*Arg*/)
{
- TInt errRet = 0;
+ TInt errRet;
CTrapCleanup* cleanup = CTrapCleanup::New();
TRAPD(err , errRet = ServiceFailedFunctionL()) ;
delete cleanup ;
@@ -394,7 +394,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val = 0;
+ TInt Val ;
//Install a new active scheduler to this thread
TRAPD(err ,( Val = ConcurrentGetLocCallsL()) );
delete cleanup ;
@@ -450,7 +450,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val = 0;
+ TInt Val ;
//Install a new active scheduler to this thread
TRAPD(err ,( Val = ConcurrentTraceCallsL()) );
delete cleanup ;
@@ -468,7 +468,7 @@
{
CTrapCleanup* cleanup = CTrapCleanup::New();
- TInt Val = 0;
+ TInt Val ;
//Install a new active scheduler to this thread
TRAPD(err ,( Val = TraceTimeOutFuncL()) );
delete cleanup ;
--- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctestblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctestblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -814,7 +814,6 @@
delete CoreObj;
__UHEAP_MARKEND ;
- return error;
}
TInt CTLocTest :: EmptyCancelLocAsynch(CStifItemParser& /*aItem*/)
--- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tstraysignaltest.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tstraysignaltest.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -122,7 +122,7 @@
TInt StrayTest(TAny */*Arg*/)
{
- TInt errval = 0;
+ TInt errval;
CTrapCleanup* cleanup = CTrapCleanup::New();
//Install a new active scheduler to this thread
TRAPD(err , errval = StrayTestL()) ;
--- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctestblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctestblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -3229,7 +3229,7 @@
TInt iRequestType;
public :
TInt HandleNotifyL(HPositionGenericInfo* aOutPos , TInt aError) ;
- TraceLCallBackOpts3(TInt transId,TInt req) :iCount(0) , iRetStatus(KErrGeneral){
+ TraceLCallBackOpts3(TInt transId,TInt req) :iCount(0) , iRetStatus(KErrGeneral){+
iTransactionId = transId;
iRequestType = req;
}
@@ -3785,7 +3785,7 @@
//
TInt CSAPILocTest::GetPositionOpts1( CStifItemParser& /*aItem*/ )
{
- TInt ret = 0;
+ TInt ret;
TPositionInfo currPos;
TPositionUpdateOptions options;
TTimeIntervalMicroSeconds aTimeOut = 0;
--- a/serviceproviders/sapi_logging/inc/loggingcallback.h Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/inc/loggingcallback.h Tue Aug 31 16:06:03 2010 +0300
@@ -81,10 +81,9 @@
* Implementation of CancelNotifyL method, derived from MLoggingCB
*
* @param aTransid, Transaction id
- * @param aFlag, Flag for notification to LiwBinding
*/
- void CancelNotifyL( TUint aTransid , TBool aFlag );
+ void CancelNotifyL( TUint aTransid );
/**
* GetRequestType
--- a/serviceproviders/sapi_logging/loggingservice/inc/loggingasyncservice.h Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/loggingservice/inc/loggingasyncservice.h Tue Aug 31 16:06:03 2010 +0300
@@ -132,14 +132,7 @@
{
iInterval = aInterval ;
}
- /**
- * Sets the boolean flag iFlagCancel
- */
- inline void SetCancelFlag(TBool aValue)
- {
- iFlagCancel = aValue;
- }
-
+
/**
* Default Desturctor
*/
@@ -202,7 +195,6 @@
TTimeIntervalMicroSeconds32 iInterval ;
CLogViewEvent* iLogViewEvent;
CLogFilter* iFilter;
- TBool iFlagCancel;
};
@@ -238,10 +230,9 @@
* methods
*
* @param aTransId , Transaction id
- * @param aFlag, Flag for notification to LiwBinding
*/
- virtual void CancelNotifyL(TUint aTransid ,TBool aFlag) = 0 ;
+ virtual void CancelNotifyL(TUint aTransid) = 0 ;
/**
* Default Desturctor
--- a/serviceproviders/sapi_logging/loggingservice/src/loggingasyncservice.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/loggingservice/src/loggingasyncservice.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -112,7 +112,6 @@
CLogAsyncService :: CLogAsyncService(): CActive(EPriorityStandard)
{
iTransId=0;
- iFlagCancel=ETrue;
}
/**
@@ -309,9 +308,7 @@
}
}
-
- iCallback->CancelNotifyL( iTransId, iFlagCancel );
-
+ iCallback->CancelNotifyL( iTransId );
if(iUpdatedEvent)
{
--- a/serviceproviders/sapi_logging/loggingservice/src/loggingservice.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/loggingservice/src/loggingservice.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -47,7 +47,6 @@
*/
for(TInt iter = 0 ; iter < iRegTable.Count() ; ++iter)
{
- iRegTable[iter]->GetActiveObj()->SetCancelFlag(EFalse);
delete iRegTable[iter] ;
}
delete iLogService;
--- a/serviceproviders/sapi_logging/src/loggingcallback.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/src/loggingcallback.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -427,20 +427,17 @@
}
- void LoggingInterfaceCB :: CancelNotifyL( TUint aTransid ,TBool aFlag )
+ void LoggingInterfaceCB :: CancelNotifyL( TUint aTransid )
{
- if(aFlag)
- {
- CleanupStack :: PushL( this ) ;
- CLiwGenericParamList *OutParm = CLiwGenericParamList :: NewL() ;
- CleanupStack :: PushL( OutParm ) ;
- CLiwGenericParamList *InParm = CLiwGenericParamList :: NewL() ;
- CleanupStack :: PushL( InParm ) ;
- OutParm->AppendL( TLiwGenericParam( KErrCode , TLiwVariant( ( TInt32 )SErrNone ) ) ) ;
- iCallBack->HandleNotifyL( aTransid, KLiwEventCanceled, *OutParm, *InParm ) ;
- CleanupStack::PopAndDestroy( InParm );
- CleanupStack::PopAndDestroy( OutParm );
- CleanupStack :: Pop( this ) ;
- }
+ CleanupStack :: PushL( this ) ;
+ CLiwGenericParamList *OutParm = CLiwGenericParamList :: NewL() ;
+ CleanupStack :: PushL( OutParm ) ;
+ CLiwGenericParamList *InParm = CLiwGenericParamList :: NewL() ;
+ CleanupStack :: PushL( InParm ) ;
+ OutParm->AppendL( TLiwGenericParam( KErrCode , TLiwVariant( ( TInt32 )SErrNone ) ) ) ;
+ iCallBack->HandleNotifyL( aTransid, KLiwEventCanceled, *OutParm, *InParm ) ;
+ CleanupStack::PopAndDestroy( InParm );
+ CleanupStack::PopAndDestroy( OutParm );
+ CleanupStack :: Pop( this ) ;
delete this;
}
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -39,8 +39,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tloggingprovidertest.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidercallback.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidercallback.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -98,6 +98,6 @@
}
iRetVal = KErrNone ;
- return 0;
+
}
\ No newline at end of file
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -38,8 +38,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tloggingservice.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest1.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest1.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -87,14 +87,10 @@
iter = LogService->GetListL(filter) ;
- while (1){
- aEvent = iter->NextL();
- if(aEvent){
+ while (aEvent = iter->NextL())
+ {
LogService->DeleteEventL(aEvent->Id()) ;
delete aEvent ;
- }
- else
- break;
}
delete iter ;
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent1.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent1.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -87,12 +87,9 @@
CLogIter *iter = LogService->GetListL(filter) ;
CLogsEvent *iterevents ;
- while(1){
- iterevents = iter->NextL();
- if(iterevents)
+ while(iterevents = iter->NextL())
+ {
delete iterevents ;
- else
- break;
}
delete updatedEvent ;
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist1.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist1.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -83,12 +83,9 @@
CLogIter *iter = LogService->GetListL(filter) ;
- while(1){
- events = iter->NextL();
- if(events)
+ while (events = iter->NextL())
+ {
delete events ;
- else
- break;
}
delete event ;
--- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tloggingblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tloggingblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -489,12 +489,9 @@
CLogsEvent *aEvent ;
- while(1){
- aEvent = iter->NextL();
- if(aEvent)
+ while(aEvent = iter->NextL())
+ {
delete aEvent ;
- else
- break;
}
--- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/group/tlogtypeidtest.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/group/tlogtypeidtest.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -23,8 +23,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tlogtypeidtest.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertestobserver.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -68,7 +68,6 @@
if(iWait)
iWait->AsyncStop();
- return 0;
}
--- a/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -38,8 +38,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
TARGET tloggingservicetest.dll
TARGETTYPE dll
--- a/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tgetlist.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tgetlist.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -183,14 +183,10 @@
iter = iLoggingService->GetListL(filter) ;
CLogsEvent *iterevents ;
- while (1){
- iterevents = iter->NextL();
- if(iterevents){
+ while (iterevents = iter->NextL())
+ {
iLoggingService->DeleteEventL(iterevents->Id()) ;
delete iterevents ;
- }
- else
- break;
}
iter->DoCancel();
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -38,9 +38,6 @@
#include <platform_paths.hrh>
MW_LAYER_SYSTEMINCLUDE
-APP_LAYER_SYSTEMINCLUDE
-
-
TARGET tlogprovidertest.dll
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/taddtest.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/taddtest.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -208,7 +208,7 @@
a.ResetAndDestroy();
a.Close();
- return 0;
+
}
@@ -401,7 +401,7 @@
- return 0;
+
}
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcallback.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcallback.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -95,6 +95,6 @@
}
iRetVal = KErrNone ;
- return 0;
+
}
\ No newline at end of file
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcancel.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcancel.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -300,7 +300,7 @@
a.ResetAndDestroy();
a.Close();
- return 0;
+
}
@@ -568,7 +568,7 @@
a.ResetAndDestroy();
a.Close();
- return 0;
+
}
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tdelete.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tdelete.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -256,7 +256,7 @@
a.ResetAndDestroy();
a.Close();
- return 0;
+
}
@@ -514,7 +514,7 @@
a.ResetAndDestroy();
a.Close();
- return 0;
+
}
@@ -742,7 +742,7 @@
a.ResetAndDestroy();
a.Close();
- return 0;
+
}
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tgetlist.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tgetlist.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -278,7 +278,7 @@
a.ResetAndDestroy() ;
a.Close() ;
- return 0;
+
}
@@ -505,7 +505,7 @@
a.ResetAndDestroy() ;
a.Close() ;
- return 0;
+
}
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertestblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertestblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -1364,7 +1364,6 @@
__UHEAP_MARKEND;
if(ret == KErrArgument)
return KErrNone;
- return ret;
}
--- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tmisc.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tmisc.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -161,7 +161,7 @@
a.ResetAndDestroy();
a.Close();
- return 0;
+
}
@@ -297,7 +297,7 @@
a.ResetAndDestroy();
a.Close();
- return 0;
+
}
@@ -408,7 +408,7 @@
a.ResetAndDestroy();
a.Close();
- return 0;
+
}
--- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -19,7 +19,6 @@
#include <MCLFItem.h>
#include "mgpostfilter.h"
-#include <mmfcontrollerpluginresolver.h>
const TInt32 KLargestSigned32 = 0x7fffffff;
const TInt64 KLargestSigned64 = 0x7fffffffffffffff;
@@ -56,7 +55,6 @@
RPointerArray<MCLFItem>& aFilteredItemList )
{
// It will filter the Items
- CleanupResetAndDestroyPushL(aFilteredItemList);
MCLFItem* item = NULL;
for( TInt i = 0 ; i < aItemList.Count() ; ++i )
@@ -69,7 +67,6 @@
aFilteredItemList.AppendL( item );
}
}
- CleanupStack::Pop(&aFilteredItemList);
}
// -----------------------------------------------------------------------------
--- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmtblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmtblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -244,6 +244,13 @@
output->AppendL( responseTypeParam );
}
+ else
+ {
+ delete aListModel;
+ aListModel = NULL;
+ delete aOperationObserver;
+ aOperationObserver = NULL;
+ }
// call callback of consumer
@@ -428,7 +435,7 @@
CActiveScheduler :: Stop() ;
return KErrNone;
}
- return KErrNone;
+
}
// -----------------------------------------------------------------------------
@@ -441,7 +448,7 @@
// Creating the Cleanup stack for this new thread
CTrapCleanup* cleanup = CTrapCleanup::New();
struct ParamPass* arg1 = (ParamPass*) a;
- TInt errorCode = KErrNone;
+ TInt errorCode;
TInt error = KErrNone;
TRAP(error, errorCode = GetFilesAsynchL(a));
delete cleanup;
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/src/mgpostfilter.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/performance/s60_perf/src/mgpostfilter.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -20,7 +20,7 @@
#include <mclfitem.h>
#include "mgpostfilter.h"
-#include <mmfcontrollerpluginresolver.h>
+
const TInt32 KLargestSigned32 = 0x7fffffff;
const TInt64 KLargestSigned64 = 0x7fffffffffffffff;
@@ -55,7 +55,6 @@
void CPostFilter::FilterItemsL( const TArray<MCLFItem*>& aItemList,
RPointerArray<MCLFItem>& aFilteredItemList )
{
- CleanupResetAndDestroyPushL(aFilteredItemList);
// It will filter the Items
MCLFItem* item = NULL;
@@ -69,7 +68,6 @@
aFilteredItemList.AppendL( item );
}
}
- CleanupStack::Pop(&aFilteredItemList);
}
// -----------------------------------------------------------------------------
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tprovidertestobserver.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -74,7 +74,6 @@
if(iWait)
iWait->AsyncStop();
- return 0;
}
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaobserver.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaobserver.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -692,5 +692,5 @@
iFile.Write(_L8("End of observer"));
- return KErrNone;
+
}
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingBlocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingBlocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -123,7 +123,6 @@
User::Leave(KErrNotFound);
}
}
- return KErrNone;
}
/* --------------------------------------------------------------------------
--- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingImpl.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingImpl.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -489,7 +489,6 @@
TInt expRes = expValue.AsTInt32();
TInt resRes = resValue.AsTInt32();
-
expIntStr.AppendNum(expRes);
resIntStr.AppendNum(resRes);
--- a/serviceproviders/sapi_messaging/messagingservice/group/messagingservice.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_messaging/messagingservice/group/messagingservice.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -59,7 +59,7 @@
LIBRARY smcm.lib
LIBRARY charconv.lib
LIBRARY mtur.lib
-LIBRARY gsmu.lib
+
paged
--- a/serviceproviders/sapi_messaging/messagingservice/inc/sendmessage.h Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_messaging/messagingservice/inc/sendmessage.h Tue Aug 31 16:06:03 2010 +0300
@@ -21,12 +21,10 @@
#include <rsendas.h>
#include <rsendasmessage.h>
-#include <gsmumsg.h>
class CMsvAttachment;
class CRecipientList;
class CMsgCallbackBase;
-class CSmsMessage;
/**
* This class provides functionality for sending SMS/MMS messages.
--- a/serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -675,20 +675,7 @@
CSmsHeader& smsHdr = clientMtm->SmsHeader();
CSmsSettings* smsSetting = CSmsSettings::NewLC();
smsSetting->CopyL(clientMtm->ServiceSettings());
- TInt pdus;
- TInt numberOfUnconvertedChars;
- TInt numberOfDowngradedChars;
- TInt freeUDUnitsInLastPDU;
- CSmsMessage& smsMsg = smsHdr.Message();
- smsMsg.GetEncodingInfoL(pdus, numberOfUnconvertedChars, numberOfDowngradedChars, freeUDUnitsInLastPDU );
- if( numberOfUnconvertedChars || numberOfDowngradedChars )
- {
smsSetting->SetCharacterSet(TSmsDataCodingScheme::ESmsAlphabetUCS2);
- }
- else
- {
- smsSetting->SetCharacterSet(TSmsDataCodingScheme::ESmsAlphabet7Bit);
- }
smsHdr.SetSmsSettingsL(*smsSetting);
CleanupStack::PopAndDestroy(smsSetting);
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/notify.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/notify.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -130,7 +130,6 @@
{
iWaitSchedular->AsyncStop();
}
- return 0;
}
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/get_headerblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/get_headerblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -139,7 +139,6 @@
++i;
i++;
//CActiveScheduler::Stop();
- return 0;
}
};
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertestobserver.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -68,7 +68,6 @@
if(iWait)
iWait->AsyncStop();
- return 0;
}
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_asyncBlocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_asyncBlocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -260,7 +260,7 @@
else
iResult= KErrGeneral;
- return 0;
+
}
// -----------------------------------------------------------------------------
--- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/reqnotification.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/reqnotification.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -197,5 +197,5 @@
-// return 0;
+ return 0;
}
--- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertestobserver.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertestobserver.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -68,7 +68,6 @@
if(iWait)
iWait->AsyncStop();
- return 0;
}
--- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/conf/tserviceregistry.cfg Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/conf/tserviceregistry.cfg Tue Aug 31 16:06:03 2010 +0300
@@ -1,7 +1,7 @@
[Test]
title GetContactDataList
create tserviceregistrytest testModule
-testModule GetMetaDataListL 0 0 InputStart ServiceName Service.Contact InterfaceName IDataSource MinimumVersion 1.0 MaximumVersion 5.0 InputEnd ExpectedStart StartMap ServiceName Service.Contact InterfaceName IDataSource VersionList 2.0 EndMap ExpectedEnd
+testModule GetMetaDataListL 0 0 InputStart ServiceName Service.Logging InterfaceName IDataSource MinimumVersion 1.0 MaximumVersion 5.0 InputEnd ExpectedStart StartMap ServiceName Service.Logging InterfaceName IDataSource VersionList 2.0 EndMap ExpectedEnd
delete testModule
[Endtest]
@@ -9,7 +9,7 @@
[Test]
title GetAllDataList
create tserviceregistrytest testModule
-testModule GetMetaDataListL 0 0 ExpectedStart StartMap ServiceName Service.ServiceRegistry InterfaceName IService MinimumVersion 1.1 EndMap StartMap ServiceName Service.contact InterfaceName IDataSource VersionList 2.0 EndMap ExpectedEnd
+testModule GetMetaDataListL 0 0 ExpectedStart StartMap ServiceName Service.ServiceRegistry InterfaceName IService MinimumVersion 1.0 EndMap StartMap ServiceName Service.Logging InterfaceName IDataSource VersionList 2.0 EndMap ExpectedEnd
delete testModule
[Endtest]
--- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytestblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytestblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -135,7 +135,7 @@
if(code != iExpectedError)
{
iResult = KErrGeneral;
- return 0;
+ return;
}
}
@@ -151,7 +151,7 @@
iResult = KErrNone;
}
}
- return 0;
+
}
TInt CIServiceTestModule::LoadProviderTest(CStifItemParser& aItem)
@@ -513,7 +513,6 @@
Delete();
__UHEAP_MARKEND;
- return 0;
}
@@ -844,8 +843,8 @@
TLiwVariant resValue;
TBool equal = EFalse;
- TReal expValueReal = 0;
- TReal resValueReal = 0;
+ TReal expValueReal;
+ TReal resValueReal;
if(!aExpectedMap->FindL(aKey, expValue))
{
--- a/serviceproviders/sapi_sysinfo/inc/sysinfoaiwparams.hrh Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/inc/sysinfoaiwparams.hrh Tue Aug 31 16:06:03 2010 +0300
@@ -145,13 +145,6 @@
_LIT8(KCamResList,"ResolutionList");
_LIT8(KCamMimeTypesList,"MimeTypeList");
-
-_LIT8(KCapability, "capability");
-_LIT8(KDecManufacturer, "manufacturer");
-_LIT8(KIdentifier, "identifier");
-_LIT8(KAccelerated, "accelerated");
-_LIT8(KMaxBitrate, "maxBitrate");
-_LIT8(KVersion, "version");
}
-#endif //__SYSINFO_AIWPARAMS_HRH_
+#endif //__SYSINFO_AIWPARAMS_HRH_
\ No newline at end of file
--- a/serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -876,40 +876,7 @@
CleanupStack::PopAndDestroy( camResList );
}
break;
- case CSysData::EVideoDecList:
- {
- CLiwList* decResList = CLiwDefaultList::NewL();
- CleanupClosePushL( *decResList );
- const CVideoDecDataList* declist = ((CVideoDecDataList*) aInSysData);
- count = declist->Count();
- CVideoDecDataList::CVideoDecData * decinfo = NULL;
-
- for ( int index=0; index<count; index++ )
- {
- TInt val = 0;
- CLiwMap* resMap = CLiwDefaultMap::NewL();
- CleanupStack::PushL( resMap );
- decinfo=(*declist)[index];
- TPtrC temp;
- temp.Set(*(decinfo->Manufacturer));
- TPtrC temp1;
- temp1.Set(*(decinfo->Identifier));
-
- resMap->InsertL( KDecManufacturer, temp );
- resMap->InsertL( KIdentifier, temp1 );
- resMap->InsertL( KMaxBitrate, (TInt32)decinfo->MaxBitrate );
- resMap->InsertL( KAccelerated, (TBool)decinfo->Accelerated );
- resMap->InsertL( KVersion, decinfo->Version );
-
- decResList->AppendL( resMap );
- CleanupStack::Pop( resMap );
- resMap->Close();
- }
- aOutMapParam->InsertL( KCapability, decResList );
- CleanupStack::PopAndDestroy( decResList );
- //aOutMapParam->InsertL( KCapability, 1 );
- }
- break;
+
default:
User::Leave(KErrArgument);
}
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/bwins/sysinfoserviceu.def Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/bwins/sysinfoserviceu.def Tue Aug 31 16:06:03 2010 +0300
@@ -60,6 +60,4 @@
?Count@CCameraResolutionList@@QBEHXZ @ 59 NONAME ; int CCameraResolutionList::Count(void) const
?MimeTypesList@CCameraInfo@@QBEPAVCStringList@@XZ @ 60 NONAME ; class CStringList * CCameraInfo::MimeTypesList(void) const
?ResolutionList@CCameraInfo@@QBEPAVCCameraResolutionList@@XZ @ 61 NONAME ; class CCameraResolutionList * CCameraInfo::ResolutionList(void) const
- ??ACVideoDecDataList@@QBEPAUCVideoDecData@0@H@Z @ 62 NONAME ; struct CVideoDecDataList::CVideoDecData * CVideoDecDataList::operator[](int) const
- ?Count@CVideoDecDataList@@QBEHXZ @ 63 NONAME ; int CVideoDecDataList::Count(void) const
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/eabi/sysinfoserviceu.def Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/eabi/sysinfoserviceu.def Tue Aug 31 16:06:03 2010 +0300
@@ -60,6 +60,4 @@
_ZNK21CCameraResolutionList2AtEiiRi @ 59 NONAME
_ZNK21CCameraResolutionList5CountEv @ 60 NONAME
_ZNK21CCameraResolutionListixEi @ 61 NONAME
- _ZNK17CVideoDecDataList5CountEv @ 62 NONAME
- _ZNK17CVideoDecDataListixEi @ 63 NONAME
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/group/sysinfoservice.mmp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/group/sysinfoservice.mmp Tue Aug 31 16:06:03 2010 +0300
@@ -66,7 +66,7 @@
LIBRARY PlatformEnv.lib
LIBRARY ImagingConfigManager.lib
LIBRARY Avkon.lib // PhoneLanguage
-LIBRARY estlib.lib devvideo.lib //strlen function
+LIBRARY estlib.lib //strlen function
paged
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/entitykeys.h Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/entitykeys.h Tue Aug 31 16:06:03 2010 +0300
@@ -62,7 +62,7 @@
_LIT(KActiveConnections,"ActiveConnections");
_LIT(KConnectionStatus, "ConnectionStatus");
_LIT(KWLanMacAddress, "WLanMacAddress");
-_LIT(KWirelessConnSupport, "WirelessConnSupport");
+
_LIT(KCamera, "Camera");
_LIT(KMemoryCard, "MemoryCard");
@@ -75,14 +75,7 @@
_LIT(KCoverUI, "CoverUI");
_LIT(KSideVolumeKeys, "SideVolumeKeys");
_LIT(KVibra, "Vibra");
-_LIT(KVideoDecoder, "VideoDecoder");
-_LIT(KBT, "Bluetooth");
-_LIT(KIrda, "Irda");
-_LIT(KWlan, "Wlan");
-_LIT(KGsm, "Gsm");
-_LIT(KWcdma, "Wcdma");
-_LIT(KCdma, "Cdma");
_LIT(KBrightness, "Brightness");
_LIT(KPowerSaverTimeOut,"PowerSaverTimeOut");
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h Tue Aug 31 16:06:03 2010 +0300
@@ -53,8 +53,7 @@
EResolution,
EStringList,
EStringData,
- ECameraInfo,
- EVideoDecList
+ ECameraInfo
};
public:
/**
@@ -923,65 +922,5 @@
CCameraResolutionList* iResList;
CStringList* iMimeTypesList;
};
-/**
-* @ref CVideoDecDataList
-*
-* @lib sysinfoservice.lib
-* @since S60 3.2
-*/
-NONSHARABLE_CLASS(CVideoDecDataList) : public CSysData
- {
- public:
- struct CVideoDecData
- {
- CVideoDecData(const TDesC &iManufacturer,const TDesC &iIdentifier,TInt iMaxBitrate,TBool iAccelerated,const TDesC &iVersion)
- :MaxBitrate(iMaxBitrate),Accelerated(iAccelerated)
- {
- Manufacturer = iManufacturer.AllocL();
- Identifier = iIdentifier.AllocL();
- Version=iVersion.AllocL();
- }
-
- TInt MaxBitrate;
- TBool Accelerated;
- HBufC* Manufacturer;
- HBufC* Identifier;
- HBufC* Version;
- };
- public:
- /**
- * Two-phased constructor.
- *
- * @return A new instance of this class.
- */
- static CVideoDecDataList* NewL();
- /**
- * @return drive number.
- */
- void AppendL(CVideoDecData *entry);
- IMPORT_C CVideoDecData *operator[](TInt aIndex) const;
- /**
- * @return number of drives.
- */
- IMPORT_C TInt Count() const;
- /**
- * Destructor.
- */
- ~CVideoDecDataList();
-
- private:
- /**
- * C++ default constructor.
- */
- CVideoDecDataList();
- /**
- * Symbian 2nd phase constructor.
- */
- void ConstructL();
-
- private:
- RArray<CVideoDecData *> iDecData;
- TInt iCount;
-};
#endif __SYSINFO_H__
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfoservice.h Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfoservice.h Tue Aug 31 16:06:03 2010 +0300
@@ -23,7 +23,6 @@
#include "sysinfo.h"
#include "sysrequest.h"
#include "imagingconfigmanager.h"
-#include <mmf\devvideo\devvideoplay.h >
// FORWORD CLASS DECLARATION
class CSysData;
@@ -293,47 +292,6 @@
CDeviceInfo* iDeviceInfo;
};
-/**
-* @ref MMMFDevVideoPlayObserverImpl is used as video observer
-*
-* @lib sysinfoservice
-* @since S60 9.2
-* @version $Revision: 1.0 $
-*/
-class MMMFDevVideoPlayObserverImpl : public MMMFDevVideoPlayObserver
- {
- public:
-
- /* Dummy implementation for virtual function */
- virtual void MdvpoNewBuffers() {}
- /* Dummy implementation for virtual function */
- virtual void MdvpoReturnPicture(TVideoPicture* ) {}
- /* Dummy implementation for virtual function */
- virtual void MdvpoSupplementalInformation(const TDesC8& ,
- const TTimeIntervalMicroSeconds& ,
- const TPictureId& ) {}
- /* Dummy implementation for virtual function */
- virtual void MdvpoPictureLoss() {}
- /* Dummy implementation for virtual function */
- virtual void MdvpoPictureLoss(const TArray<TPictureId>& ) {}
- /* Dummy implementation for virtual function */
- virtual void MdvpoSliceLoss(TUint , TUint , const TPictureId& ){}
- /* Dummy implementation for virtual function */
- virtual void MdvpoReferencePictureSelection(const TDesC8& ){}
- /* Dummy implementation for virtual function */
- virtual void MdvpoTimedSnapshotComplete(TInt ,
- TPictureData* ,
- const TTimeIntervalMicroSeconds& ,
- const TPictureId& ){}
- /* Dummy implementation for virtual function */
- virtual void MdvpoNewPictures() {}
- /* Dummy implementation for virtual function */
- virtual void MdvpoFatalError(TInt ) {}
- /* Dummy implementation for virtual function */
- virtual void MdvpoInitComplete(TInt ) {}
- /* Dummy implementation for virtual function */
- virtual void MdvpoStreamEnd() {}
- };
#endif __CSYSINFOSERVICE_H__
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/activestore.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/activestore.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -100,12 +100,10 @@
aActiveObj = CPubSubNotifier::NewL(aSysRequest,
CPubSubNotifier::EInfraRed);
- else if( (!Key.CompareF(SysInfo::KActiveConnections)) && (aSysRequest.RequestType() == TSysRequest::EASyncONESHOT) )
+ else if( (!Key.CompareF(SysInfo::KConnectionStatus))
+ || (!Key.CompareF(SysInfo::KActiveConnections)))
aActiveObj = CConnection::NewL(aSysRequest);
- else if( (!Key.CompareF(SysInfo::KConnectionStatus)) && (aSysRequest.RequestType() == TSysRequest::ENotification) )
- aActiveObj = CConnection::NewL(aSysRequest);
-
else
User::Leave(KErrNotFound);
}
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -1386,75 +1386,5 @@
{
return iMimeTypesList;
}
-
-// --------------------------------------------------------------------
-// CVideoDecDataList::CVideoDecDataList()
-// Constructor.
-// --------------------------------------------------------------------
-//
-CVideoDecDataList::CVideoDecDataList():CSysData(EVideoDecList)
- {
- }
-
-// --------------------------------------------------------------------
-// CDriveList::~CDriveList()
-// Destructor
-// --------------------------------------------------------------------
-//
-CVideoDecDataList::~CVideoDecDataList()
- {
- for(int i=0;i<iDecData.Count();i++)
- delete iDecData[i];
- }
-
-// --------------------------------------------------------------------
-// CDriveList::NewL()
-// Two-phased constructor. returns new instance of this class.
-// --------------------------------------------------------------------
-//
-CVideoDecDataList* CVideoDecDataList::NewL()
- {
- CVideoDecDataList* self;
- self = new (ELeave) CVideoDecDataList();
- CleanupStack::PushL(self);
- self->ConstructL();
- CleanupStack::Pop(self);
- return self;
- }
-
-// --------------------------------------------------------------------
-// CDriveList::ConstructL()
-// 2nd phase construtor
-// --------------------------------------------------------------------
-//
-void CVideoDecDataList::ConstructL()
- {
- }
-
-void CVideoDecDataList::AppendL(CVideoDecData *entry)
- {
- iDecData.AppendL(entry);
- }
-// --------------------------------------------------------------------
-// CDriveList::[]
-// gets drive number at specified index.
-// --------------------------------------------------------------------
-//
-EXPORT_C CVideoDecDataList::CVideoDecData *CVideoDecDataList::operator[](TInt aIndex) const
- {
- if(0 <= aIndex && aIndex<iDecData.Count())
- return iDecData[aIndex];
- else
- return NULL;
- }
-
-// --------------------------------------------------------------------
-// CDriveList::Count
-// returns number of drives.
-// --------------------------------------------------------------------
-//
-EXPORT_C TInt CVideoDecDataList::Count() const
- {
- return iDecData.Count();
- }
+
// End of file.
--- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoservice.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoservice.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -444,7 +444,7 @@
User::LeaveIfError(RProperty::Get(KPSUidNetworkInfo,
KNWRegistrationStatus,status));
}
- else if( !aKey.CompareF(SysInfo::KNetworkMode) )
+ else if( !aKey.CompareF(KNetworkMode) )
{
User::LeaveIfError(RProperty::Get(KPSUidNetworkInfo,
KNWTelephonyNetworkMode,status));
@@ -579,28 +579,6 @@
featureID = KFeatureIdSideVolumeKeys;
else if( !aKey.CompareF(KVibra) )
featureID = KFeatureIdVibra;
- else if( !aKey.CompareF(KVideoDecoder) )
- {
- MMMFDevVideoPlayObserverImpl obsImpl;
- RArray<TUid> aDecoders;
- CMMFDevVideoPlay *videoPlay=CMMFDevVideoPlay::NewL(obsImpl);
- //place object on cleanupstack.
- CleanupStack::PushL(videoPlay);
-
- videoPlay->GetDecoderListL(aDecoders);
- CVideoDecDataList *decDataList=CVideoDecDataList::NewL();
- for(int i=0;i<aDecoders.Count();i++)
- {
- CVideoDecoderInfo *decoderInfo=videoPlay->VideoDecoderInfoLC(aDecoders[i]);
- CVideoDecDataList::CVideoDecData *data=new CVideoDecDataList::CVideoDecData(decoderInfo->Manufacturer(),decoderInfo->Identifier(),decoderInfo->MaxBitrate(),decoderInfo->Accelerated(),decoderInfo->Version().Name());
- decDataList->AppendL(data);
- CleanupStack::PopAndDestroy(decoderInfo);
- }
-
- aSysData = decDataList;
- CleanupStack::PopAndDestroy(videoPlay);
- return;
- }
else
User::Leave(KErrNotFound);
@@ -689,48 +667,6 @@
}
aSysData = CStringData::NewL(FormatedMacAddress);
}
- else if( !aKey.CompareF(KWirelessConnSupport) )
- {
- CDesCArray* connTypesDesArray;
- connTypesDesArray = new (ELeave) CDesCArrayFlat(4);
- CleanupStack::PushL(connTypesDesArray);
-
- //Initialize the feature manager if not already done.
- if (!iFeatureManagerInitialized)
- {
- FeatureManager::InitializeLibL();
- iFeatureManagerInitialized = ETrue;
- }
-
- if(FeatureManager::FeatureSupported(KFeatureIdBt))
- {
- connTypesDesArray->AppendL(KBT);
- }
- if(FeatureManager::FeatureSupported(KFeatureIdIrda))
- {
- connTypesDesArray->AppendL(KIrda);
- }
- if(FeatureManager::FeatureSupported(KFeatureIdProtocolWlan))
- {
- connTypesDesArray->AppendL(KWlan);
- }
- if(FeatureManager::FeatureSupported(KFeatureIdProtocolGsm))
- {
- connTypesDesArray->AppendL(KGsm);
- }
- if(FeatureManager::FeatureSupported(KFeatureIdProtocolWcdma))
- {
- connTypesDesArray->AppendL(KWcdma);
- }
- if(FeatureManager::FeatureSupported(KFeatureIdProtocolCdma))
- {
- connTypesDesArray->AppendL(KCdma);
- }
-
- //connTypesDesArray ownership passed to CStringList.
- aSysData = CStringList::NewL(connTypesDesArray);
- CleanupStack::Pop(connTypesDesArray);
- }
else
User::Leave(KErrNotFound);
}
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertestsblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertestsblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -1723,8 +1723,9 @@
interface->Close();
CleanupStack::PopAndDestroy(iServiceHandler);
+
+ return result;
__UHEAP_MARKEND;
- return result;
}
else
{
@@ -2038,10 +2039,9 @@
CleanupStack::PopAndDestroy( iServiceHandler );
- __UHEAP_MARKEND;
return result;
-
+ __UHEAP_MARKEND;
}
@@ -3803,7 +3803,7 @@
//
TInt Ctsysinfoprovidertests::GetCameraInfoTestNegative(CStifItemParser& aItem)
{
- TInt retcode = 0;
+ TInt retcode;
iLog->Log(_L("GetCameraInfoTest - Negative Test") );
__UHEAP_MARK;
@@ -3976,7 +3976,7 @@
TInt Ctsysinfoprovidertests::GetCameraInfoNegEntity(CStifItemParser& aItem)
{
_LIT8(KEntity1, "Entity1");
- TInt retcode = 0;
+ TInt retcode;
iLog->Log(_L("GetCameraInfoNegEntity - Negative Test") );
__UHEAP_MARK;
@@ -4136,7 +4136,7 @@
TInt Ctsysinfoprovidertests::GetCameraInfoNegKey(CStifItemParser& aItem)
{
_LIT8(KKey1, "Key1");
- TInt retcode = 0;
+ TInt retcode;
iLog->Log(_L("GetCameraInfoNegKey - Negative Test") );
__UHEAP_MARK;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibra.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibra.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -363,8 +363,8 @@
test->Start();
TInt retval = test->Result();
delete test;
+ return retval;
__UHEAP_MARKEND;
- return retval;
}
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotify.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotify.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -372,8 +372,8 @@
aLog->Log(_L("after test->Result() Vibra:"));
delete test;
+ return retval;
__UHEAP_MARKEND;
- return retval;
}
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotifyreqcancel.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotifyreqcancel.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -195,8 +195,7 @@
TRAPD(err1, interface->ExecuteCmdL(KGetNotification,*inparam,*outparam,KLiwOptASyncronous,this));
iResult = err1;
iLog->Log(_L("after getnotification vibra Active:"));
- TInt pos = 0;
- TInt transactionid = 0;
+ TInt pos = 0, transactionid ;
const TLiwGenericParam* output2 = outparam->FindFirst( pos,KTransactionId );
iLog->Log(_L("after FindFirst vibra Active:"));
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -160,7 +160,7 @@
else
{
const CLiwMap* outmap = ret_val->Value().AsMap();
- const CLiwList* drvlist = NULL;
+ const CLiwList* drvlist;
TLiwVariant variant_drvlist;
if( outmap->FindL(KDriveList,variant_drvlist) )
@@ -251,7 +251,7 @@
else
{
const CLiwMap* outmap = ret_val->Value().AsMap();
- const CLiwList* drvlist = NULL;
+ const CLiwList* drvlist;
TLiwVariant variant_drvlist;
if( outmap->FindL(KDriveList,variant_drvlist) )
@@ -2718,9 +2718,9 @@
interface->Close();
CleanupStack::PopAndDestroy(iServiceHandler);
- __UHEAP_MARKEND;
+
return result;
-
+ __UHEAP_MARKEND;
}
else
{
@@ -3015,10 +3015,10 @@
interface->Close();
CleanupStack::PopAndDestroy( iServiceHandler );
- __UHEAP_MARKEND;
+
return result;
-
+ __UHEAP_MARKEND;
}
@@ -3324,7 +3324,7 @@
//
TInt Ctsysinfoprovidertests::GetCameraInfoTest(CStifItemParser& aItem)
{
- TInt retcode = 0;
+ TInt retcode;
iLog->Log(_L("GetCameraInfoTest - Positive Test") );
__UHEAP_MARK;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tvibra.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tvibra.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -325,9 +325,8 @@
test->Start();
TInt retval = test->Result();
delete test;
+ return retval;
__UHEAP_MARKEND;
- return retval;
-
}
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfoflipstatus.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfoflipstatus.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -124,18 +124,12 @@
CSysData* data1 = NULL;
TRAPD(err2,iSysInfoService->GetInfoL(KGeneral,KFlipStatus,data1));
- iResult = err2;
- if(err2 != KErrNone)
- return;
flipstatus = ((CStatus*)data1)->Status();
CStatus* data2 = CStatus::NewL(!flipstatus);
TRAPD(err3,iSysInfoService->SetInfoL(KGeneral,KFlipStatus,data2));
- iResult = err3;
- if( err3 != KErrNone )
- return;
delete data1;
delete data2;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogripstatus.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogripstatus.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -125,17 +125,12 @@
CSysData* data1 = NULL;
TRAPD(err2,iSysInfoService->GetInfoL(KGeneral,KGripStatus,data1));
- iResult = err2;
- if( err2 != KErrNone )
- return;
+
gripstatus = ((CStatus*)data1)->Status();
CStatus* data2 = CStatus::NewL(!gripstatus);
TRAPD(err3,iSysInfoService->SetInfoL(KGeneral,KGripStatus,data2));
- iResult = err3;
- if( err3 != KErrNone )
- return;
delete data1;
delete data2;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tuseractivitynotifier.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tuseractivitynotifier.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -55,8 +55,8 @@
CTestUserActivity::CTestUserActivity(CStifLogger* aLog,TInt aTimeOut,
Test_Type aType) :
CActive(EPriorityStandard),
+ iLog(aLog),
iInactivityTimeOut(aTimeOut),
- iLog(aLog),
iTestType(aType)
{
}
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidasync.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidasync.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CCellidAsync::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(60000000);
iTransId = 333;
TRAPD(err ,iSysInfoService->GetInfoL(KNetwork,KCellID,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidnotify.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocellidnotify.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CCellidNotify::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
iTransId = 444;
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KCellID,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworkasync.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworkasync.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CCurrentNetAsync::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
iTransId = 5555;
TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KCurrentNetwork,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworknotify.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfocurrentnetworknotify.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CCurrentNetNotify::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
iTransId = 6666;
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KCurrentNetwork,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworkasync.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworkasync.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CHomeNwAsync::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
iTransId = 1;
TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KHomeNetwork,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworknotify.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfohomenetworknotify.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CHomeNetworkNotify::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
iTransId = 222;
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KCurrentNetwork,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacasync.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacasync.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CLacAsync::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
iTransId = 7777;
TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KLocationArea,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacnotify.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfolacnotify.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CLacNotify::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
iTransId = 8888;
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KLocationArea,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworkmodenotify.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworkmodenotify.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CNetModeNotify::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KNetworkMode,111,this));
iResult = err;
iTimer->After(OneMinute);
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinforegstatusnotify.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinforegstatusnotify.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CRegStatusNotify::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
TRAPD(err ,iSysInfoService->GetNotificationL(KNetwork,KRegistrationStatus,9999,this));
iResult = err ;
iTimer->After(OneMinute);
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelasync.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelasync.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CSigLevelAsync::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
iTransId = 3333;
TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KSignalLevel,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelnotify.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosiglevelnotify.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CSigLevelNotify::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
iTransId = 4444;
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KSignalLevel,iTransId,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthasyn.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthasyn.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CSignalStrAsync::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
TRAPD(err,iSysInfoService->GetInfoL(KNetwork,KSignalStrength,1111,this));
iResult = err;
iTimer->After(OneMinute);
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthnotify.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfosigstrengthnotify.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -81,8 +81,7 @@
void CSignalStrNotify::TestFuncL()
{
- TInt64 x = 6000000000;
- const TTimeIntervalMicroSeconds32 OneMinute = TTimeIntervalMicroSeconds32(x);
+ const TTimeIntervalMicroSeconds32 OneMinute(6000000000);
TRAPD(err,iSysInfoService->GetNotificationL(KNetwork,KSignalStrength,2222,this));
iResult = err;
--- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetestsblocks.cpp Thu Aug 19 10:46:25 2010 +0300
+++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetestsblocks.cpp Tue Aug 31 16:06:03 2010 +0300
@@ -2366,7 +2366,7 @@
{
TInt result = KErrNone;
- TInt newDisplayLang = 0;
+ TInt newDisplayLang;
__UHEAP_MARK;
--- a/tsrc/group/bld.inf Thu Aug 19 10:46:25 2010 +0300
+++ b/tsrc/group/bld.inf Tue Aug 31 16:06:03 2010 +0300
@@ -19,15 +19,15 @@
// *****************mediagallery related testapps***********************
#include "../../serviceproviders/sapi_landmarks/tsrc/group/bld.inf"
-#include "../../serviceproviders/sapi_applicationmanager/tsrc/group/bld.inf"
+//#include "../../serviceproviders/sapi_applicationmanager/tsrc/group/bld.inf"
#include "../../serviceproviders/sapi_mediamanagement/tsrc/group/bld.inf"
#include "../../serviceproviders/sapi_location/tsrc/group/bld.inf"
#include "../../serviceproviders/sapi_logging/tsrc/group/bld.inf"
-#include "../../serviceproviders/sapi_contacts_vpbk/tsrc/group/bld.inf"
+//#include "../../serviceproviders/sapi_contacts_vpbk/tsrc/group/bld.inf"
#include "../../serviceproviders/sapi_sysinfo/tsrc/group/bld.inf"
-#include "../../serviceproviders/sapi_calendar/tsrc/group/bld.inf"
+//#include "../../serviceproviders/sapi_calendar/tsrc/group/bld.inf"
#include "../../serviceproviders/sapi_sensor/tsrc/group/bld.inf"
-#include "../../serviceproviders/sapi_messaging/tsrc/group/bld.inf"
+//#include "../../serviceproviders/sapi_messaging/tsrc/group/bld.inf"
#include "../../serviceproviders/sapi_serviceregistry/tsrc/group/bld.inf"