diff -r 40a3f856b14d -r 41a7f70b3818 phoneengine/engineinfo/inc/mpeengineinfo.h --- a/phoneengine/engineinfo/inc/mpeengineinfo.h Thu Aug 19 09:54:27 2010 +0300 +++ b/phoneengine/engineinfo/inc/mpeengineinfo.h Tue Aug 31 15:14:29 2010 +0300 @@ -22,6 +22,7 @@ // INCLUDES #include +#include "mpecallsettersif.h" // CONSTANTS // None @@ -40,7 +41,7 @@ * @lib phoneengine.lib * @since Series 60 4.0 */ -NONSHARABLE_CLASS( MPEEngineInfo ) +NONSHARABLE_CLASS( MPEEngineInfo ) : public MPECallSettersIF { public: @@ -254,12 +255,6 @@ virtual const TInt& KeypadVolume() const = 0; /** - * Gets lifetimer data - * @return lifetime data (TDes8&) - */ - virtual const TPELifeTimeData& LifeTimerData() const = 0; - - /** * Gets a logging indicator * @param aCallId, call identification number * @return continuous logging indicator @@ -296,12 +291,6 @@ virtual const TBool& PersonalToneStatus() const = 0; /** - * Gets phone identity parameters - * @return phone identity parameters. - */ - virtual const TPEPhoneIdentityParameters& PhoneIdentityParameters() const = 0; - - /** * Gets phone number * @return Reference to TPEPhoneNumber, containing the phone number of the remote party. */ @@ -640,7 +629,7 @@ * Returns address choices from received call forward request * or NULL if addresses are not available. * - * @param aCallId Call identification number. + * @param aCallId Call identification number. * @return Address array. */ virtual const CDesC8Array* ForwardAddressChoices( TInt aCallId ) const = 0; @@ -686,9 +675,9 @@ */ virtual TBool IsSwitchToOperationOngoing() const = 0; - /** + /** * Checks if given state can be found. - * @param aCallState state to be checked. + * @param aCallState state to be checked. */ virtual TBool CheckIfCallStateExists( const TPEState& aCallState )= 0; @@ -699,26 +688,35 @@ virtual TPECallOrigin CallOrigin( const TInt aCallId ) const = 0; /** - * Sets flag indicating unattended transfer dial - * @param aTransferDial ETrue if voip unattended transfer dial was initiated + * Returns Phonebook contact identifier. */ - virtual void SetIsTransferDial( TBool aTransferDial ) = 0; + virtual TInt ContactId2 () const = 0; /** - * Returns flag indicating unattended transfer dial - */ - virtual TBool IsTransferDial() const = 0; - + * Sets the protocol spesific error code + * @param aError is the error code from protocol. + * @return None. + */ + virtual void SetProtocolError( TInt aError, TInt aCallId ) = 0; + /** - * Sets unattended transfer call back address - * @param aAddress Unattended transfer call back address - */ - virtual void SetCallBackAddress( const TDesC& aAddress ) = 0; + * Returns the protocol spesific error code + * @return Error code. + */ + virtual TInt ProtocolError( TInt aCallId ) = 0; /** - * Returns unattended transfer call back address - */ - virtual const TDesC& CallBackAddress() const = 0; + * Returns flag if the outgoing barring is activated. + * @return ETrue if barring activated. + */ + virtual TBool IsOutgoingCallBarringActivated() = 0; + + /** + * Sets the flag if the outgoing barring is activated. + * @return ETrue if barring activated. + */ + virtual void SetOutgoingCallBarringActivated( + TBool aActivated ) = 0; }; // MPEEngineInfo