--- a/phoneengine/engineinfo/src/cpeengineinfoimpl.cpp Tue Jun 15 14:14:38 2010 +0100
+++ b/phoneengine/engineinfo/src/cpeengineinfoimpl.cpp Thu Jul 22 16:33:21 2010 +0100
@@ -57,10 +57,6 @@
iBasicInfo.iErrorInfo.iCallId = KPECallIdNotUsed;
iBasicInfo.iProfileId = ECCPErrorNotFound;
iBasicInfo.iProfileName = KNullDesC;
- iBasicInfo.iPhoneIdentityParameters.iManufacturer = KNullDesC;
- iBasicInfo.iPhoneIdentityParameters.iModel = KNullDesC;
- iBasicInfo.iPhoneIdentityParameters.iRevision = KNullDesC;
- iBasicInfo.iPhoneIdentityParameters.iSerialNumber = KNullDesC;
iBasicInfo.iLastCallDuration = KPENumberInitValue;
iBasicInfo.iVMBXNumbers.iVMBXL1 = KNullDesC;
iBasicInfo.iVMBXNumbers.iVMBXL2 = KNullDesC;
@@ -68,8 +64,6 @@
iBasicInfo.iTextToSpeech = EFalse;
iBasicInfo.iPhoneNumberIsServiceCode = EFalse;
iBasicInfo.iTwoDigitSupportStatus = EFalse;
- iBasicInfo.iLifeTimeData.iHours = 0;
- iBasicInfo.iLifeTimeData.iMinutes = 0;
iBasicInfo.iNetworkRegistrationStatus = ENWStatusRegistrationUnknown;
@@ -100,7 +94,7 @@
iBasicInfo.iDataPortName = KNullDesC;
iBasicInfo.iSwitchToOngoing = EFalse;
iConferenceCallInfo.iConferenceCallState = EPEStateConferenceIdle;
-
+ iBasicInfo.iOutgoingBarringActivated = EFalse;
//TODO remove after profile information is available
iBasicInfo.iRingingVolume = 10;
}
@@ -568,17 +562,6 @@
}
// -----------------------------------------------------------------------------
-// CPEEngineInfoImpl::LifeTimerData
-// Gets lifetimerdata from the TPEBasicInfo structure.
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-const TPELifeTimeData& CPEEngineInfoImpl::LifeTimerData() const
- {
- return iBasicInfo.iLifeTimeData;
- }
-
-// -----------------------------------------------------------------------------
// CPEEngineInfoImpl::LoggingIndicator
// Get logging indicator from TPECallInfo.
// (other items were commented in a header).
@@ -629,16 +612,6 @@
}
// -----------------------------------------------------------------------------
-// CPEEngineInfoImpl::PhoneIdentityParameters
-// Gets the phone identity parameters from the TPEBasicInfo structure
-// -----------------------------------------------------------------------------
-//
-const TPEPhoneIdentityParameters& CPEEngineInfoImpl::PhoneIdentityParameters() const
- {
- return iBasicInfo.iPhoneIdentityParameters;
- }
-
-// -----------------------------------------------------------------------------
// CPEEngineInfoImpl::PhoneNumber
// Return the phone number from the TPECallCommandInfo structure.
// -----------------------------------------------------------------------------
@@ -1340,18 +1313,6 @@
}
// -----------------------------------------------------------------------------
-// CPEEngineInfoImpl::SetLifeTimerData
-// Sets lifetimer data of the phone to TPELifeTimeData-structure
-// -----------------------------------------------------------------------------
-//
-void CPEEngineInfoImpl::SetLifeTimerData(
- TCCPLifeTimeDataPckg& aPckg )
- {
- iBasicInfo.iLifeTimeData.iHours = aPckg().iHours;
- iBasicInfo.iLifeTimeData.iMinutes = aPckg().iMinutes;
- }
-
-// -----------------------------------------------------------------------------
// CPEEngineInfoImpl::SetNetworkRegistrationStatus
// Sets network registration status to TPEBasicInfo-structure
// -----------------------------------------------------------------------------
@@ -1379,17 +1340,6 @@
}
// -----------------------------------------------------------------------------
-// CPEEngineInfoImpl::SetPhoneIdentityParameters
-// Sets phone number to TPECallCommandInfo-structure
-// -----------------------------------------------------------------------------
-//
-void CPEEngineInfoImpl::SetPhoneIdentityParameters(
- const TPEPhoneIdentityParameters& aPhoneIdentityParameters )
- {
- iBasicInfo.iPhoneIdentityParameters = aPhoneIdentityParameters;
- }
-
-// -----------------------------------------------------------------------------
// CPEEngineInfoImpl::SetPhoneNumberIsServiceCode
// Sets phone number parsing result
// -----------------------------------------------------------------------------
@@ -2550,7 +2500,7 @@
// -----------------------------------------------------------------------------
//
void CPEEngineInfoImpl::SetRemoteColpNumber(
- TPEPhoneNumber& aColpNumber,
+ const TPEPhoneNumber& aColpNumber,
const TInt aCallId )
{
return ( *iRemoteInfo )[ aCallId ]->SetColpNumber( aColpNumber );
@@ -2641,4 +2591,53 @@
return iContactId;
}
+// -----------------------------------------------------------------------------
+// CPEEngineInfoImpl::SetProtocolError
+// Sets the protocol spesific error code
+// -----------------------------------------------------------------------------
+//
+void CPEEngineInfoImpl::SetProtocolError( TInt aError, TInt aCallId )
+ {
+ if ( 0<=aCallId && aCallId<iCurrentCalls.Count() )
+ {
+ iCurrentCalls[ aCallId ]->SetProtocolError( aError );
+ }
+ }
+
+// -----------------------------------------------------------------------------
+// CPEEngineInfoImpl::ProtocolError
+// Returns the protocol spesific error code
+// -----------------------------------------------------------------------------
+//
+TInt CPEEngineInfoImpl::ProtocolError( TInt aCallId )
+ {
+ TInt ret( KErrNotFound );
+
+ if ( 0<=aCallId && aCallId<iCurrentCalls.Count() )
+ {
+ ret = iCurrentCalls[ aCallId ]->ProtocolError();
+ }
+
+ return ret;
+ }
+
+// -----------------------------------------------------------------------------
+// CPEEngineInfoImpl::IsOutgoingCallBarringActivated
+// -----------------------------------------------------------------------------
+//
+TBool CPEEngineInfoImpl::IsOutgoingCallBarringActivated()
+ {
+ return iBasicInfo.iOutgoingBarringActivated;
+ }
+
+// -----------------------------------------------------------------------------
+// CPEEngineInfoImpl::SetOutgoingCallBarringActivated
+// -----------------------------------------------------------------------------
+//
+void CPEEngineInfoImpl::SetOutgoingCallBarringActivated(
+ TBool aActivated )
+ {
+ iBasicInfo.iOutgoingBarringActivated = aActivated;
+ }
+
// End of File