--- a/locationmanager/locationtrail/inc/clocationrecord.h Fri Mar 19 09:38:01 2010 +0200
+++ b/locationmanager/locationtrail/inc/clocationrecord.h Fri Apr 16 15:23:55 2010 +0300
@@ -54,13 +54,25 @@
/**
* This method is used to notify about location trail state changes.
*/
- virtual void LocationTrailStateChange() __SOFTFP = 0;
+ virtual void LocationTrailStateChange() = 0;
virtual void CurrentLocation( const TPositionSatelliteInfo& aSatelliteInfo,
const CTelephony::TNetworkInfoV1& aNetworkInfo,
- const TInt aError ) __SOFTFP = 0;
+ const TInt aError ) = 0;
+
+ virtual void GPSSignalQualityChanged( const TPositionSatelliteInfo& aSatelliteInfo ) = 0;
- virtual void GPSSignalQualityChanged( const TPositionSatelliteInfo& aSatelliteInfo ) __SOFTFP = 0;
+ /**
+ * Callback method to notify observer that during waiting for positioning stop timeout remap is done.
+ */
+ virtual void RemapedCompleted() = 0;
+
+ /**
+ * Returns if in ETrialStopping state server waits for positioning stop timeout
+ * @returns <code>ETrue</code> if server is waiting for positioning stop timeout
+ * <code>EFalse</code>, otherwise.
+ */
+ virtual TBool WaitForPositioningStopTimeout() = 0;
};
/**
@@ -81,7 +93,7 @@
* This method is used to notify about new locations added to location trail
*/
virtual void LocationAdded( const TLocationTrailItem& aTrailItem,
- const TPositionSatelliteInfo& aSatellites ) __SOFTFP = 0;
+ const TPositionSatelliteInfo& aSatellites ) = 0;
};
/**
@@ -147,7 +159,7 @@
TLocationData& aLocationData,
/*TLocality& aPosition,
CTelephony::TNetworkInfoV1& aNetworkInfo,*/
- TLocTrailState& aState ) __SOFTFP;
+ TLocTrailState& aState );
/**
* Request location info. The result is returned by calllback method.
@@ -171,7 +183,7 @@
* @param aCellId, Network cell is written into this param.
* @return None.
*/
- IMPORT_C void GetNetworkInfo( CTelephony::TNetworkInfoV1& aNetworkInfo ) __SOFTFP;
+ IMPORT_C void GetNetworkInfo( CTelephony::TNetworkInfoV1& aNetworkInfo );
/**
* Set observer for notifying state changes.
@@ -189,11 +201,11 @@
static TInt UpdateNetworkInfo( TAny* aAny );
IMPORT_C void CreateLocationObjectL( const TLocationData& aLocationData,
- const TUint& aObjectId ) __SOFTFP;
+ const TUint& aObjectId );
IMPORT_C void LocationSnapshotL( const TUint& aObjectId );
- TItemId DoCreateLocationL( const TLocationData& aLocationData ) __SOFTFP;
+ TItemId DoCreateLocationL( const TLocationData& aLocationData );
TItemId CreateRelationL( const TUint& aObjectId, const TUint& aLocationId );
@@ -212,7 +224,7 @@
* @param
* @return
*/
- void NetworkInfo( const CTelephony::TNetworkInfoV1 &aNetworkInfo, TInt aError ) __SOFTFP;
+ void NetworkInfo( const CTelephony::TNetworkInfoV1 &aNetworkInfo, TInt aError );
public: // from MPositionInfoObserver
/**
@@ -221,7 +233,7 @@
* @param
* @return
*/
- void Position( const TPositionInfo& aPositionInfo, const TInt aError ) __SOFTFP;
+ void Position( const TPositionInfo& aPositionInfo, const TInt aError );
public: // From MMdEQueryObserver