--- a/locationrequestmgmt/networkrequesthandler/inc/privacyandlocationrequesthandler.h Tue Aug 31 16:38:06 2010 +0300
+++ b/locationrequestmgmt/networkrequesthandler/inc/privacyandlocationrequesthandler.h Wed Sep 01 12:35:25 2010 +0100
@@ -121,8 +121,6 @@
TPositionModuleInfoExtended::TDeviceGpsModeCapabilities DeviceGpsModeCaps();
CLbsAdmin::TLbsBehaviourMode BehaviourMode();
RLbsNetworkRegistrationStatus& NetworkRegistrationStatus();
- void IncrementPositioningStatus();
- void DecrementPositioningStatus();
private:
static TBool IsSessionIdEqual(
@@ -164,12 +162,6 @@
CLbsPrivLocFsm* iMolRFsm;
CLbsPrivLocFsm* iX3pFsm;
-
- // ETrue if location management is supported
- TBool iLocationManagementSupported;
-
- // Category of the Positioning Status P&S Keys
- TUid iPosStatusCategory;
};
@@ -445,7 +437,7 @@
RLbsNetworkRegistrationStatus& LbsNetworkRegistrationStatus();
TPositionModuleInfoExtended::TDeviceGpsModeCapabilities DeviceGpsModeCaps();
CLbsAdmin::TLbsBehaviourMode BehaviourMode();
- void IncrementPositioningStatus();
+
protected:
CLbsPrivLocFsm* iFsm;
@@ -784,16 +776,9 @@
TLbsNetSessionIdInt& LastLocReqSessionId()
{ return iLastLocReqSessionId; }
- TBool& WasPrivacyResponseReceivedStateExited()
+ TBool& WasPrivacyResponseReceivedStateExited()
{ return iWasPrivacyResponseReceivedStateExited; }
- TLbsExternalRequestInfo::TRequestType& ExternalRequestType()
- { return iExternalRequestType; }
-
- TBool& WasPositioningStatusIncremented()
- { return iPositioningStatusIncremented; }
-
-
private: // Allow access for friend classes (the states and the NRH)
friend class CLbsPrivLocStateBase;
friend class CLbsNetworkRequestHandler;
@@ -875,12 +860,6 @@
// Has a privacy request been rejected?
TBool iWasPrivacyResponseReceivedStateExited;
- // The type of external request that has been recieved.
- TLbsExternalRequestInfo::TRequestType iExternalRequestType;
-
- // Indicates if this session resulted in the positioning status being incremented.
- TBool iPositioningStatusIncremented;
-
private:
// the states
CLbsPrivLocStateBase* iCurrentState;