diff -r 7d48bed6ce0c -r 987c9837762f convergedcallengine/cce/src/cccedtmf.cpp --- a/convergedcallengine/cce/src/cccedtmf.cpp Tue Aug 31 15:45:17 2010 +0300 +++ b/convergedcallengine/cce/src/cccedtmf.cpp Wed Sep 01 12:15:03 2010 +0100 @@ -70,9 +70,9 @@ { CCELOGSTRING("CCCEDtmf::~CCCEDtmf"); - while( iObservers.Count() ) - { - CCELOGSTRING("CCCEDtmf::~CCCEDtmf: There are dtmf observers in the array. Should be removed before dtor!"); + while( iObservers.Count() ) + { + CCELOGSTRING("CCCEDtmf::~CCCEDtmf: There are dtmf observers in the array. Should be removed before dtor!"); iObservers.Remove ( 0 ); iObservers.Compress(); } @@ -103,8 +103,7 @@ if( !error && provider ) { - // Ref-to-Ptr -> ownership not transfered. - err = aProviders.InsertInAddressOrder( provider ); + aProviders.InsertInAddressOrder( provider ); } } @@ -249,7 +248,7 @@ else { // already added, ignore - CCELOGSTRING("CCCEDtmf::AddObserverL. Observer to be added already existed. Operation ignored!"); + CCELOGSTRING("CCCEDtmf::AddObserverL. Observer to be added already existed. Operation ignored!"); } } @@ -260,17 +259,17 @@ TInt CCCEDtmf::RemoveObserver( const MCCEDtmfObserver& aObserver ) { CCELOGSTRING("CCCEDtmf::RemoveObserver"); - TInt index = iObservers.Find( &aObserver ); + TInt index = iObservers.Find( &aObserver ); if( index!=KErrNotFound ) { iObservers.Remove ( index ); iObservers.Compress(); } - else - { - return KErrNotFound; - } + else + { + return KErrNotFound; + } return KErrNone; } @@ -290,11 +289,11 @@ MCCEDtmfObserver::TCCEDtmfEvent event = (MCCEDtmfObserver::TCCEDtmfEvent)(aEvent); - for( TInt i=0; i(iObservers[i])->HandleDTMFEvent( event, - aError, - aTone ); + for( TInt i=0; i(iObservers[i])->HandleDTMFEvent( event, + aError, + aTone ); } }