FCL/sf/app/phone: comparison phoneengine/engineinfo/inc/cpeengineinfoimpl.h

equal deleted inserted replaced

-:40a3f856b14d
+:41a7f70b3818
 // None.
 // DATA TYPES
 NONSHARABLE_STRUCT( TPECallCommandInfo )                  // For Mobile Originated Call Commands
 {
-	TChar iKeyCode;                         // pressed key code
+TChar iKeyCode;                         // pressed key code
-	TInt iAudioMute;                        // state of microphone ( 0 = false, 1 = true )
+TInt iAudioMute;                        // state of microphone ( 0 = false, 1 = true )
-	TInt iAudioVolume;                      // Audio volume
+TInt iAudioVolume;                      // Audio volume
-	TPEAudioOutput iAudioOutput;            // audio output path
+TPEAudioOutput iAudioOutput;            // audio output path
-	TBool iShowNote;                        // Status of call audio route info note.
+TBool iShowNote;                        // Status of call audio route info note.
-	TInt iCallId;                           // Calls ID
+TInt iCallId;                           // Calls ID
-	TPEDtmfString iDtmfString;              // Dtmf string to be sent.
+TPEDtmfString iDtmfString;              // Dtmf string to be sent.
-	TPEPhoneNumber iPhoneNumber;            // Dialed Phonenumber, set by client
+TPEPhoneNumber iPhoneNumber;            // Dialed Phonenumber, set by client
-	TPECallType iCallType;                  // Type of the attempted call
+TPECallType iCallType;                  // Type of the attempted call
-	TUint32 iServiceId;                     // ServiceId
+TUint32 iServiceId;                     // ServiceId
-	TPECallOrigin iCallOrigin;              // Origin of the attempted call (Phone, client or SAT)
+TPECallOrigin iCallOrigin;              // Origin of the attempted call (Phone, client or SAT)
-	RMobileCall::TMobileCallIdRestriction iIdRestrict; // Call Id restriction setting to be used for this call
+RMobileCall::TMobileCallIdRestriction iIdRestrict; // Call Id restriction setting to be used for this call
-	TPEPhoneNumber iEmergencyNumber;        // For checking is this number emergency number.
+TPEPhoneNumber iEmergencyNumber;        // For checking is this number emergency number.
-	TPEUserToUserInfo iUserToUserInfo;      // User to user information.
+TPEUserToUserInfo iUserToUserInfo;      // User to user information.
-	TPEPhoneNumber iSwitchToNumber;         // Dialed Phonenumber, set by client
+TPEPhoneNumber iSwitchToNumber;         // Dialed Phonenumber, set by client
-	TPEPhoneNumber iTransferToAddress;      // Unattended transfer target address
+TPEPhoneNumber iTransferToAddress;      // Unattended transfer target address
 TInt iForwardToAddressIndex;            // Array index for a address to be forwarded
-TBool iTransferDial;                    // Flag which indicates utransfer dial
 };
 NONSHARABLE_STRUCT( TPEBasicInfo )                         // Contains information of the phone related variables
 {
-	TBool iAudioMute;                       // state of microphone.
+TBool iAudioMute;                       // state of microphone.
-	TBool iTwoDigitSupportStatus;           // Two Digit support status
+TBool iTwoDigitSupportStatus;           // Two Digit support status
-	TBool iALSLineSupport;                  // ALS line support.
+TBool iALSLineSupport;                  // ALS line support.
-	TInt iAudioOutputPreference;            // Audio output preference (private/public) - TODO: change type to enum when available
+TInt iAudioOutputPreference;            // Audio output preference (private/public) - TODO: change type to enum when available
-	TInt iAudioVolume;                      // Audio volume
+TInt iAudioVolume;                      // Audio volume
-	TInt iKeypadVolume;                     // Keypad volume
+TInt iKeypadVolume;                     // Keypad volume
-	TInt iLastCallDuration;                 // Call duration (seconds)
+TInt iLastCallDuration;                 // Call duration (seconds)
-	TInt iPersonalToneStatus;               // Personal tone status
+TInt iPersonalToneStatus;               // Personal tone status
-	TInt iProfileId;                        // the id number of the profile
+TInt iProfileId;                        // the id number of the profile
-	TInt iRingingVolume;                    // Current ringing volume
+TInt iRingingVolume;                    // Current ringing volume
-	TBool iTextToSpeech;                    // Current text-to-speech setting
+TBool iTextToSpeech;                    // Current text-to-speech setting
-	TBool iPhoneNumberIsServiceCode;        // flag indicating if the phone number is a service code
+TBool iPhoneNumberIsServiceCode;        // flag indicating if the phone number is a service code
-	TNWNetworkRegistrationStatus iNetworkRegistrationStatus;
+TNWNetworkRegistrationStatus iNetworkRegistrationStatus;
 CCCECallParameters::TCCELineType iALSLine;        // includes active als line.
-	TPEContactFileName iRingingToneName1;   // Current ringingtone name
+TPEContactFileName iRingingToneName1;   // Current ringingtone name
-	TPEContactFileName iRingingToneName2;
+TPEContactFileName iRingingToneName2;
-	TPEContactFileName iVideoCallRingingTone; // Video call ringingtone name
+TPEContactFileName iVideoCallRingingTone; // Video call ringingtone name
-	TPEDtmfString iDtmfString;              // Dtmf string.
+TPEDtmfString iDtmfString;              // Dtmf string.
-	TPEErrorInfo iErrorInfo;                // possible error code
+TPEErrorInfo iErrorInfo;                // possible error code
-	TPELifeTimeData iLifeTimeData;
+TPEProfileName iProfileName;            // the name of the profile
-	TPEPhoneIdentityParameters iPhoneIdentityParameters; // the phone identity parameters
+TProfileRingingType iRingingType;       // Includes current ringing type
-	TPEProfileName iProfileName;            // the name of the profile
+TPEVoiceMailBoxNumberInfo iVMBXNumbers; // Voice mail box numbers
-	TProfileRingingType iRingingType;       // Includes current ringing type
+TPEPhoneAudioRouteParameters iPhoneAudioRouteParameters; // the phone audio route parameters
-	TPEVoiceMailBoxNumberInfo iVMBXNumbers; // Voice mail box numbers
+TCCPTone iInbandTone;                   // Inband tone needed to play in a call state transition or error
-	TPEPhoneAudioRouteParameters iPhoneAudioRouteParameters; // the phone audio route parameters
+TPEActiveForwardInfo iActiveForward;    // active forward information.
-	TCCPTone iInbandTone;                   // Inband tone needed to play in a call state transition or error
+TPEBarringInfo iBarringInfo;            // includes call barring information.
-	TPEActiveForwardInfo iActiveForward;    // active forward information.
+TPESimState iSimState;
-	TPEBarringInfo iBarringInfo;            // includes call barring information.
+TPESSCommandInfo iSSCommandInfo;        // Contains information of the Suplementary Services command.
-	TPESimState iSimState;
-	TPESSCommandInfo iSSCommandInfo;        // Contains information of the Suplementary Services command.
 TBool iSecureSpecified;                 // Secure specified status
-	TName iDataPortName;                    // the name of data port currently on-loan
+TName iDataPortName;                    // the name of data port currently on-loan
 TBool iSwitchToOngoing;                 // Switch to operation status
-TPEPhoneNumber iCallBackAddress;        // Address of the transfer originator used for calling back
+TBool iOutgoingBarringActivated;        // Outgoing barring activated
 };
 NONSHARABLE_STRUCT( TPEConferenceCallInfo ) // Contains conference call related variables
 {
 TPEState iConferenceCallState;
 * Gets secure status from call info
 * @param aCallId is the call identification number.
 * @return TBool the secure status (on/off)
 */
 TBool IsSecureCall( const TInt aCallId ) const;
 /**
 * Gets dtmf postfix
 * @param aCallId is the call identification number.
 * @return dtmf postfix
 */
 * @return the inband tone to be played
 */
 const TCCPTone& InbandTone() const;
 /**
-* Gets lifetimer data
-* @return lifetime data (TDes8&)
-*/
-const TPELifeTimeData& LifeTimerData() const;
-/**
 * Gets network registration status
 * @return TNWNetworkRegistrationStatus Network registration status
 */
 const TNWNetworkRegistrationStatus& NetworkRegistrationStatus() const;
-/**
-* Gets phone identity parameters from TPEBasicInfo-structure
-* @param aPhoneIdentityParameters is the phone identity parameters.
-*/
-const TPEPhoneIdentityParameters& PhoneIdentityParameters() const;
 /**
 * Gets phone number
 * @return Reference to TPEPhoneNumber, containing the phone number of the remote party.
 */
 */
 TPECallOrigin CallOrigin( const TInt aCallId ) const;
 /**
 * Checks if given state can be found.
-		 * @param aCallState state to be checked.
+* @param aCallState state to be checked.
 */
 TBool CheckIfCallStateExists( const TPEState& aCallState );
 /**
-* From base class MPEEngineInfo
+* Sets the protocol spesific error code
-* @see MPEEngineInfo::SetTransferDial
+* @param aError is the error code from protocol.
+* @return None.
 */
-void SetIsTransferDial( TBool aTransferDial );
+void SetProtocolError( TInt aError );
-/**
-* From base class MPEEngineInfo
-* @see MPEEngineInfo::IsTransferDial
-*/
-TBool IsTransferDial() const;
-/**
-* From base class MPEEngineInfo
-* @see MPEEngineInfo::SetCallBackAddress
-*/
-void SetCallBackAddress( const TDesC& aAddress );
-/**
-* From base class MPEEngineInfo
-* @see MPEEngineInfo::CallBackAddress
-*/
-const TDesC& CallBackAddress() const;
 // Functions from MPEDataStore (reading values)
 public:
 /**
 * Gets group ids which are active to play ring tone
 /**
 * From base class MPEDataStore
 * @see MPEDataStore::CallIndex
 */
 TInt CallIndex( TInt aCallId ) const;
-/**
-* From base class MPEDataStore
-* @see MPEDataStore::DoCallBackRequest
-*/
-TBool DoCallBackRequest( TInt aCallId ) const;
 // Functions from MPEDataStore (setting values)
 public:
 /**
 * Resets TPECallInfo parameters.
 /**
 * Sets Keypad volume of the phone to TPEBasicInfo-structure
 * @param aKeypadVolume is Keypad volume of the phone.
 */
 void SetKeypadVolume( const TInt aKeypadVolume );
-/**
-* Sets lifetimer data of the phone to TPEBasicInfo-structure
-* @param aLifeTimerData lifetime data (TDesc8&).
-*/
-void SetLifeTimerData( TCCPLifeTimeDataPckg& aPckg );
 /**
 * Sets a logging indicator to TPECallInfo-tructure
 * @param aLoggingIndicator, Continuous logging indicator.
 * @param aCallId, the call identification number.
 /**
 * Sets personal tone status value to TPEBasicInfo-structure.
 * @param aPersonalTone is personal tone status (EFalse/ETrue).
 */
 void SetPersonalToneStatus( const TInt& aPersonalToneStatus );
-/**
-* Sets phone number to TPECallCommandInfo-structure
-* @param aPhoneIdentityParameters is the phone identity parameters
-*/
-void SetPhoneIdentityParameters(
-const TPEPhoneIdentityParameters& aPhoneIdentityParameters );
 /**
 * Sets phone number parsing result
 * @param aServiceCode indicates if phone number a service code
 */
 /**
 * @see MPEDataStore::UserToUserInformation
 * @since S60 5.0
 */
-		void SetUserToUserInformation( const TPEUserToUserInfo& aUUI );
+void SetUserToUserInformation( const TPEUserToUserInfo& aUUI );
 /**
 * Sets remote party name given by network to TPECallInfo structure.
 * @param aName Remote party name.
 * @param aCallId Call identification number.
 */
 /**
 * From base class MPEDataStore
 * @see MPEDataStore::SetCallOrigin
 */
 void SetCallOrigin( TPECallOrigin aOrigin, TInt aCallId );
 /**
-* From base class MPEDataStore
+* Sets call Phonebook contact identifier.
-* @see MPEDataStore::SetDoCallBackRequest
+* @param aContactId is the contact identifier for a call
 */
-void SetDoCallBackRequest( TBool aDoCallBack, TInt aCallId );
+void SetContactId2( const TInt aContactId );
+/**
+* Returns Phonebook contact identifier.
+*/
+TInt ContactId2() const;
+/**
+* Sets the protocol spesific error code
+* @param aError is the error code from protocol.
+* @return None.
+*/
+void SetProtocolError( TInt aError, TInt aCallId );
+/**
+* Returns the protocol spesific error code
+* @return Error code.
+*/
+TInt ProtocolError( TInt aCallId );
+/**
+* Returns flag if the outgoing barring is activated.
+* @return ETrue if barring activated.
+*/
+TBool IsOutgoingCallBarringActivated();
+/**
+* Sets the flag if the outgoing barring is activated.
+* @return ETrue if barring activated.
+*/
+void SetOutgoingCallBarringActivated(
+TBool aActivated );
 private:
 /**
 * C++ default constructor.
 */
 CPEEngineInfoImpl();
 // Available audio outputs array
 TFixedArray<TBool, KPEMaxAudioOutputs> iAvailableAudioOutputs;
 // Contains the group id's which are active for ringtone
-	RArray< TContactItemId > iAlertForGroup;
+RArray< TContactItemId > iAlertForGroup;
 /**
 * CCE call dial parameters
 */
 CCCECallParameters *iCallParams;
+/**
+* Phonebook contact identifier.
+*/
+TInt iContactId;
 };
 #endif // CPEENGINEINFOIMPL_H

branch	RCL_3
changeset 61	41a7f70b3818
parent 19	544e34b3255a
child 62	5266b1f337bd