diff -r 2a5d4ab426d3 -r d1c62c765e48 phoneengine/engineinfo/src/cpeengineinfoimpl.cpp
--- a/phoneengine/engineinfo/src/cpeengineinfoimpl.cpp	Fri Sep 03 13:33:36 2010 +0300
+++ b/phoneengine/engineinfo/src/cpeengineinfoimpl.cpp	Fri Sep 17 17:09:12 2010 +0300
@@ -91,8 +91,7 @@
     iBasicInfo.iSSCommandInfo.group = RMobilePhone::EServiceUnspecified;
     iBasicInfo.iSimState = EPESimStatusUninitialized;
     iBasicInfo.iSecureSpecified = ETrue; 
-    iBasicInfo.iDataPortName = KNullDesC;
-    iBasicInfo.iSwitchToOngoing = EFalse;
+    iBasicInfo.iDataPortName = KNullDesC;    
     iConferenceCallInfo.iConferenceCallState = EPEStateConferenceIdle;
     iBasicInfo.iOutgoingBarringActivated = EFalse;
     //TODO remove after profile information is available
@@ -2077,18 +2076,6 @@
     return *iCallParams;
     }
 
-// -----------------------------------------------------------------------------
-// CPEEngineInfoImpl::SetSwitchToNumberCommand
-// Sets switch to number
-// -----------------------------------------------------------------------------
-//
-void CPEEngineInfoImpl::SetSwitchToNumberCommand( 
-        const TPEPhoneNumber& aPhoneNumber )
-    {
-    __ASSERT_DEBUG( !( aPhoneNumber.Length() > KPEPhoneNumberMaxLength ),
-        Panic( EPEPanicExternalDataIdOutOfRange ) );
-    iCallCommandInfo.iSwitchToNumber = aPhoneNumber;
-    }
 
 // -----------------------------------------------------------------------------
 // From base class MPEDataStore
@@ -2112,16 +2099,6 @@
     return iCurrentCalls[ aCallId ]->SetCallOrigin( aOrigin ); 
     }
 
-// -----------------------------------------------------------------------------
-// CPEEngineInfoImpl::SwitchToNumberCommand
-// Return the switch to number from the TPECallCommandInfo structure.
-// -----------------------------------------------------------------------------
-//
-const TPEPhoneNumber& CPEEngineInfoImpl::SwitchToNumberCommand() const
-    {
-    return iCallCommandInfo.iSwitchToNumber;
-    }
-
 
 // -----------------------------------------------------------------------------
 // CPEEngineInfoImpl::UnattendedTransferTarget
@@ -2211,27 +2188,6 @@
     return iCallCommandInfo.iTransferToAddress;
     }
 
-// -----------------------------------------------------------------------------
-// CPEEngineInfo::SetIsSwitchToOperationOngoing
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CPEEngineInfoImpl::SetIsSwitchToOperationOngoing( const TBool aValue )
-    {
-    TEFLOGSTRING2( KTAINT, "SetIsSwitchToOperationOngoing: %d", aValue );
-    iBasicInfo.iSwitchToOngoing = aValue;
-    }
-
-// -----------------------------------------------------------------------------
-// CPEEngineInfo::IsSwitchToOperationOngoing
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CPEEngineInfoImpl::IsSwitchToOperationOngoing() const
-    {
-    TEFLOGSTRING2( KTAINT, "IsSwitchToOperationOngoing: %d", iBasicInfo.iSwitchToOngoing );
-    return iBasicInfo.iSwitchToOngoing;
-    }
 
 // -----------------------------------------------------------------------------
 // CPEEngineInfo::CallOrigin
@@ -2640,4 +2596,33 @@
     iBasicInfo.iOutgoingBarringActivated = aActivated;
     }
 
+// -----------------------------------------------------------------------------
+// CPEEngineInfoImpl::SetProtocolError
+// Sets the protocol spesific error code
+// -----------------------------------------------------------------------------
+//
+void CPEEngineInfoImpl::SetIncomingCallForwarded( TBool aForwarded, TInt aCallId )
+    {
+    if ( 0<=aCallId && aCallId<iCurrentCalls.Count() )
+        {
+        iCurrentCalls[ aCallId ]->SetIncomingCallForwarded( aForwarded );
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CPEEngineInfoImpl::IncomingCallForwarded
+// -----------------------------------------------------------------------------
+//
+TBool CPEEngineInfoImpl::IncomingCallForwarded( TInt aCallId ) const
+    {
+    TBool ret( EFalse );
+    
+    if ( 0<=aCallId && aCallId<iCurrentCalls.Count() )
+        {
+        ret = iCurrentCalls[ aCallId ]->IncomingCallForwarded();
+        }
+    
+    return ret;
+    }
+
 // End of File