Merge.
--- a/genericpositioningplugins/locationnpppsy/inc/npppsysingletonhandler.h Sun Mar 14 13:11:31 2010 +0000
+++ b/genericpositioningplugins/locationnpppsy/inc/npppsysingletonhandler.h Mon Mar 29 12:26:38 2010 +0100
@@ -51,7 +51,7 @@
* status.
* @reuturn the pointer the the singleton handler
*/
- static CNppPsySingletonHandler* CNppPsySingletonHandler::GetInstanceL(
+ static CNppPsySingletonHandler* GetInstanceL(
MPositionerStatus& aStatusInterface );
/**
--- a/landmarks/locationlandmarks/dbmanclientlib/src/EPos_HPosLmDatabaseInfo.cpp Sun Mar 14 13:11:31 2010 +0000
+++ b/landmarks/locationlandmarks/dbmanclientlib/src/EPos_HPosLmDatabaseInfo.cpp Mon Mar 29 12:26:38 2010 +0100
@@ -256,8 +256,7 @@
// allocate memory
return User::AllocL(_FOFF(HPosLmDatabaseInfo,
- iBuffer[requiredBufferSize]));
-
+ iBuffer) + requiredBufferSize * sizeof (typeof(iBuffer)));
}
--- a/landmarks/locationlandmarks/localaccess/inc/epos_cposlmlocaldatabase.h Sun Mar 14 13:11:31 2010 +0000
+++ b/landmarks/locationlandmarks/localaccess/inc/epos_cposlmlocaldatabase.h Mon Mar 29 12:26:38 2010 +0100
@@ -360,7 +360,7 @@
* full information.
* @return The landmark.
*/
- CPosLandmark* CPosLmLocalDatabase::ReadLmLC(
+ CPosLandmark* ReadLmLC(
TPosLmItemId aLandmarkId,
TBool aIsPartial );
--- a/locationmapnavfw/library/src/mncoordinateconverterbase.cpp Sun Mar 14 13:11:31 2010 +0000
+++ b/locationmapnavfw/library/src/mncoordinateconverterbase.cpp Mon Mar 29 12:26:38 2010 +0100
@@ -37,7 +37,7 @@
//
CMnCoordinateConverterBase* CMnCoordinateConverterBase::NewL( TUid aProviderUid )
{
- TInt32 offset = static_cast<TInt32> _FOFF( CMnCoordinateConverterBase, iDtorIdKey );
+ TInt32 offset = static_cast<TInt32> (_FOFF( CMnCoordinateConverterBase, iDtorIdKey ));
const TInt KNumUidHexDigits = 8;
TBuf8<KNumUidHexDigits> uidText8;
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsuiengine.h Sun Mar 14 13:11:31 2010 +0000
+++ b/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsuiengine.h Mon Mar 29 12:26:38 2010 +0100
@@ -136,7 +136,7 @@
/**
* Creates a new server entry in Supl Settings.
*/
- void CLocSUPLSettingsUiEngine::AddNewServerL(
+ void AddNewServerL(
const TDesC& aServerAddress,
const TDesC& aIapName,
const TBool aUsageInHomeNw
--- a/locationsystemui/locationsysui/locverifier/inc/lpdrequestorprocessor.h Sun Mar 14 13:11:31 2010 +0000
+++ b/locationsystemui/locationsysui/locverifier/inc/lpdrequestorprocessor.h Mon Mar 29 12:26:38 2010 +0100
@@ -74,7 +74,7 @@
/**
* Sets Type of Request
*/
- void CLpdRequestorProcessor::SetRequestType( TInt aReqType );
+ void SetRequestType( TInt aReqType );
/**
* Resets requestor arrays and destroys requestor objects.
@@ -158,4 +158,4 @@
#endif // CLPDREQUESTORPROCESSOR_H
-// End of File
\ No newline at end of file
+// End of File
--- a/locationtriggering/ltcontainer/inc/lbtcontainerutilities.h Sun Mar 14 13:11:31 2010 +0000
+++ b/locationtriggering/ltcontainer/inc/lbtcontainerutilities.h Mon Mar 29 12:26:38 2010 +0100
@@ -116,7 +116,7 @@
*
* @return ETrue if the UIDs suffices the security polity, EFalse otherwise
*/
- static TBool LbtContainerUtilities::RunSecurityPolicy( TUid& aOwnerUid,
+ static TBool RunSecurityPolicy( TUid& aOwnerUid,
TUid& aManagerUid,
TSecureId& aStartupProcessUid,
TLbtSecurityPolicy& aSecurityPolicy );
--- a/locsrv_pub/location_triggering_api/inc/lbtstartuptrigger.h Sun Mar 14 13:11:31 2010 +0000
+++ b/locsrv_pub/location_triggering_api/inc/lbtstartuptrigger.h Mon Mar 29 12:26:38 2010 +0100
@@ -355,7 +355,7 @@
/**
* Symbian 2nd phase constructor
*/
- void CLbtStartupTrigger::ConstructL( const TDesC& aName,
+ void ConstructL( const TDesC& aName,
CLbtTriggerEntry::TLbtTriggerState aState,
const RRequestorStack& aRequestors,
TUid aManagerUi,
--- a/supl/locationomasuplprotocolhandler/protocolhandler/inc/epos_comasuplcommonconfig.h Sun Mar 14 13:11:31 2010 +0000
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/inc/epos_comasuplcommonconfig.h Mon Mar 29 12:26:38 2010 +0100
@@ -42,7 +42,7 @@
* @param None.
* @return Instance of COMASuplCommonConfig
*/
- IMPORT_C static COMASuplCommonConfig* COMASuplCommonConfig::NewL();
+ IMPORT_C static COMASuplCommonConfig* NewL();
/**
* ~COMASuplCommonConfig Method, Destructor
--- a/supl/locationomasuplprotocolhandler/protocolhandler/inc/epos_comasuplsettings.h Sun Mar 14 13:11:31 2010 +0000
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/inc/epos_comasuplsettings.h Mon Mar 29 12:26:38 2010 +0100
@@ -40,7 +40,7 @@
* @param None.
* @return Instance of COMASuplSettings
*/
- IMPORT_C static COMASuplSettings* COMASuplSettings::NewL();
+ IMPORT_C static COMASuplSettings* NewL();
/**
* ~COMASuplSettings Method, Destructor
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsettings.h Sun Mar 14 13:11:31 2010 +0000
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsettings.h Mon Mar 29 12:26:38 2010 +0100
@@ -40,7 +40,7 @@
* @param None.
* @return Instance of COMASuplSettings
*/
- static COMASuplSettings* COMASuplSettings::NewL();
+ static COMASuplSettings* NewL();
/**
* ~COMASuplSettings Method, Destructor
--- a/supl/locationomasuplprotocolhandler/supllistener/inc/epos_comasuplsmslistenerbase.h Sun Mar 14 13:11:31 2010 +0000
+++ b/supl/locationomasuplprotocolhandler/supllistener/inc/epos_comasuplsmslistenerbase.h Mon Mar 29 12:26:38 2010 +0100
@@ -112,7 +112,7 @@
*
* @since S60 v3.1
*/
- void COMASuplSmsListenerBase::SendL( const TPtr8& aMessage );
+ void SendL( const TPtr8& aMessage );
// from base class CActive
/**
--- a/supl/locationsuplfw/protocolhandlerapi/src/epos_suplkey.cpp Sun Mar 14 13:11:31 2010 +0000
+++ b/supl/locationsuplfw/protocolhandlerapi/src/epos_suplkey.cpp Mon Mar 29 12:26:38 2010 +0100
@@ -37,11 +37,6 @@
#include <libc/string.h> /* for memcpy() etc. */
#include <libc/stdlib.h> /* for _lrotl with VC++ */
-#if defined(__GNUC__) || defined(__GNU_LIBRARY__)
-#include <byteswap.h>
-#include <endian.h>
-#endif
-
#include "sha1.h"
#include "hmac.h"