diff -r ff3b6d0fd310 -r ae8abd0db65c phonecmdhandler/phonecmdhnlr/src/PhoneHandlerCallState.cpp --- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerCallState.cpp Tue Feb 02 01:11:09 2010 +0200 +++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerCallState.cpp Fri Mar 19 09:40:14 2010 +0200 @@ -17,9 +17,9 @@ // INCLUDE FILES -#include "PhoneHandlerCallState.h" -#include "PhoneHandlerControl.h" -#include "PhoneHandlerDebug.h" +#include "PhoneHandlerCallState.h" +#include "PhoneHandlerControl.h" +#include "PhoneHandlerDebug.h" #include // EXTERNAL DATA STRUCTURES @@ -50,11 +50,11 @@ // ----------------------------------------------------------------------------- // CPhoneHandlerCallState::CPhoneHandlerCallState( CPhoneHandlerControl& aControl ) -: CActive(CActive::EPriorityStandard), - iControl( aControl ) - { - CActiveScheduler::Add(this); - } +: CActive(CActive::EPriorityStandard), + iControl( aControl ) + { + CActiveScheduler::Add(this); + } // ----------------------------------------------------------------------------- // CPhoneHandlerCallState::ConstructL @@ -62,45 +62,45 @@ // ----------------------------------------------------------------------------- // void CPhoneHandlerCallState::ConstructL() - { - COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::ConstructL() start" ); - - // Allows CPhoneHandlerCallState to start to listen S60 call states. - User::LeaveIfError( - iProperty.Attach( KPSUidCtsyCallInformation, KCTsyCallState ) ); - - Subscribe(); - - COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::ConstructL() end" ); - } + { + COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::ConstructL() start" ); + + // Allows CPhoneHandlerCallState to start to listen S60 call states. + User::LeaveIfError( + iProperty.Attach( KPSUidCtsyCallInformation, KCTsyCallState ) ); + + Subscribe(); + + COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::ConstructL() end" ); + } // ----------------------------------------------------------------------------- // CPhoneHandlerCallState::NewL // Two-phased constructor. // ----------------------------------------------------------------------------- CPhoneHandlerCallState* CPhoneHandlerCallState::NewL( CPhoneHandlerControl& aControl ) - { - COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::NewL()" ); - - CPhoneHandlerCallState* self = new(ELeave) CPhoneHandlerCallState( aControl ); - CleanupStack::PushL( self ); - self->ConstructL(); - CleanupStack::Pop( self ); - - return self; - } + { + COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::NewL()" ); + + CPhoneHandlerCallState* self = new(ELeave) CPhoneHandlerCallState( aControl ); + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop( self ); + + return self; + } // Destructor CPhoneHandlerCallState::~CPhoneHandlerCallState() - { - COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::~CPhoneHandlerCallState() start" ); - - Cancel(); - iProperty.Cancel(); + { + COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::~CPhoneHandlerCallState() start" ); + + Cancel(); + iProperty.Cancel(); iProperty.Close(); - - COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::~CPhoneHandlerCallState() end" ); - } + + COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::~CPhoneHandlerCallState() end" ); + } // ----------------------------------------------------------------------------- // CPhoneHandlerCallState::RunL() @@ -109,20 +109,20 @@ // ----------------------------------------------------------------------------- // void CPhoneHandlerCallState::RunL() - { - COM_TRACE_1( "[PHONECMDHANDLER] CPhoneHandlerCallState::RunL() - return code = %d", iStatus.Int() ); - - TInt state( 0 ); - iProperty.Get( state ); - - COM_TRACE_1( "[PHONECMDHANDLER] CPhoneHandlerCallState - KTelephonyCallState = %d", state ); - - if( iStatus.Int() == KErrNone ) - { - iControl.NotifyCallState( state ); - } - - Subscribe(); + { + COM_TRACE_1( "[PHONECMDHANDLER] CPhoneHandlerCallState::RunL() - return code = %d", iStatus.Int() ); + + TInt state( 0 ); + iProperty.Get( state ); + + COM_TRACE_1( "[PHONECMDHANDLER] CPhoneHandlerCallState - KTelephonyCallState = %d", state ); + + if( iStatus.Int() == KErrNone ) + { + iControl.NotifyCallState( state ); + } + + Subscribe(); } // ----------------------------------------------------------------------------- @@ -131,11 +131,11 @@ // ----------------------------------------------------------------------------- // void CPhoneHandlerCallState::DoCancel() - { - COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::DoCancel()" ); - - iProperty.Cancel(); - } + { + COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::DoCancel()" ); + + iProperty.Cancel(); + } // ----------------------------------------------------------------------------- // CPhoneHandlerCallState::Subscribe @@ -144,12 +144,12 @@ // ----------------------------------------------------------------------------- // void CPhoneHandlerCallState::Subscribe() - { - COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::Subscribe()" ); - + { + COM_TRACE_( "[PHONECMDHANDLER] CPhoneHandlerCallState::Subscribe()" ); + iProperty.Subscribe( iStatus ); SetActive(); - } + } // // End of file