Merge tags.
--- a/serviceproviders/sapi_location/src/locationcallBack.cpp Wed Oct 21 13:56:00 2009 +0100
+++ b/serviceproviders/sapi_location/src/locationcallBack.cpp Mon Oct 26 17:47:03 2009 +0000
@@ -236,7 +236,7 @@
if(currCapability & TPositionModuleInfo :: ECapabilityDirection) //Extract direction info if any and append it
{ // as part of out parm list
- TReal direcinfo = 0;
+ TReal32 direcinfo = 0;
if(!aGenericInfo->GetValue(EPositionFieldTrueCourse , direcinfo) )
{
@@ -269,7 +269,7 @@
if(currCapability & TPositionModuleInfo :: ECapabilityCompass) //Extract compass info if any and append it
{ // as part of out parm list
- TReal compassinfo ;
+ TReal32 compassinfo ;
if(!aGenericInfo->GetValue(EPositionFieldHeading , compassinfo) )
{
--- a/serviceproviders/sapi_location/src/locationinterface.cpp Wed Oct 21 13:56:00 2009 +0100
+++ b/serviceproviders/sapi_location/src/locationinterface.cpp Mon Oct 26 17:47:03 2009 +0000
@@ -239,7 +239,7 @@
}
//LastKnownLocation Request is made by consumer
- else if (aCmdName == KCmdLastLocation)
+ else if( !(aCmdName.CompareF( KCmdLastLocation )) )
{
//Extract Update options from input List
User::LeaveIfError(iLocationService->GetLastKnownLoc(iPosition)) ;
--- a/serviceproviders/sapi_logging/loggingservice/src/loggingevent.cpp Wed Oct 21 13:56:00 2009 +0100
+++ b/serviceproviders/sapi_logging/loggingservice/src/loggingevent.cpp Mon Oct 26 17:47:03 2009 +0000
@@ -17,7 +17,12 @@
#include <e32base.h>
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
#include <logwrap.h>
+#else
+#include <logwrap.h>
+#include <logwraplimits.h>
+#endif
#include <logcli.h>
#include "loggingevent.h"
--- a/serviceproviders/sapi_logging/loggingservice/src/loggingfilter.cpp Wed Oct 21 13:56:00 2009 +0100
+++ b/serviceproviders/sapi_logging/loggingservice/src/loggingfilter.cpp Mon Oct 26 17:47:03 2009 +0000
@@ -16,6 +16,9 @@
*/
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <logwraplimits.h>
+#endif
#include <e32base.h>
#include <logcli.h>
#include "loggingfilter.h"
--- a/serviceproviders/sapi_logging/src/liwlogiter.cpp Wed Oct 21 13:56:00 2009 +0100
+++ b/serviceproviders/sapi_logging/src/liwlogiter.cpp Mon Oct 26 17:47:03 2009 +0000
@@ -17,10 +17,16 @@
*/
-#include <LiwVariant.h>
+#include <liwvariant.h>
#include <logwrap.h>
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
#include <logwrap.hrh>
-#include <LOGCLIENTCHANGEOBSERVER.H>
+#else
+#include <logwrap.hrh>
+#include <logengevents.h>
+#include <logfilterandeventconstants.hrh>
+#endif
+#include <logclientchangeobserver.h>
#include "logiter.h"
#include "logginginterface.h"
--- a/serviceproviders/sapi_logging/src/logginginterface.cpp Wed Oct 21 13:56:00 2009 +0100
+++ b/serviceproviders/sapi_logging/src/logginginterface.cpp Mon Oct 26 17:47:03 2009 +0000
@@ -20,16 +20,23 @@
#include <e32def.h>
#include <f32file.h>
#include <cntdef.h>
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
#include <logwrap.h>
-#include <logwrap.hrh>
+#else
+#include <logwrap.h>
+#include <logengevents.h>
+#include <logwraplimits.h>
+#include <logfilterandeventconstants.hrh>
+#include <logengdurations.h>
+#endif
#include <liwserviceifbase.h>
-#include <LiwCommon.h>
-#include <ecom/ImplementationProxy.h>
+#include <liwcommon.h>
+#include <ecom/implementationproxy.h>
#include <utf.h>
#include "loggingasyncservice.h"
-#include "LOGCLIENTCHANGEOBSERVER.H"
+#include "logclientchangeobserver.h"
#include "logiter.h"
#include "loggingservice.h"
#include "loggingasyncservice.h"
--- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/conf/tserviceregistry.cfg Wed Oct 21 13:56:00 2009 +0100
+++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/conf/tserviceregistry.cfg Mon Oct 26 17:47:03 2009 +0000
@@ -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 1.0 EndMap ExpectedEnd
+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 1.1 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.0 EndMap StartMap ServiceName Service.contact InterfaceName IDataSource VersionList 1.0 EndMap ExpectedEnd
+testModule GetMetaDataListL 0 0 ExpectedStart StartMap ServiceName Service.ServiceRegistry InterfaceName IService MinimumVersion 1.1 EndMap StartMap ServiceName Service.contact InterfaceName IDataSource VersionList 1.1 EndMap ExpectedEnd
delete testModule
[Endtest]
@@ -24,7 +24,7 @@
[Test]
title GetServiceNameDataList
create tserviceregistrytest testModule
-testModule GetMetaDataListL 0 0 InputStart ServiceName Service.ServiceRegistry InputEnd ExpectedStart StartMap ServiceName Service.ServiceRegistry InterfaceName IService VersionList 1.0 EndMap ExpectedEnd
+testModule GetMetaDataListL 0 0 InputStart ServiceName Service.ServiceRegistry InputEnd ExpectedStart StartMap ServiceName Service.ServiceRegistry InterfaceName IService VersionList 1.1 EndMap ExpectedEnd
delete testModule
[Endtest]