diff -r 6134b5029079 -r 876a3df1f464 convergedconnectionhandler/cchclientapi/src/cchimpl.cpp --- a/convergedconnectionhandler/cchclientapi/src/cchimpl.cpp Wed Apr 14 15:49:55 2010 +0300 +++ b/convergedconnectionhandler/cchclientapi/src/cchimpl.cpp Tue Apr 27 16:28:03 2010 +0300 @@ -293,53 +293,53 @@ // void CCchImpl::GetServicesL( TCCHSubserviceType aType, RPointerArray& aServices ) - { - TInt error = KErrNone; - TServiceSelection selection( 0, aType, ECchInitial ); - CCHLOGSTRING( "CCchImpl::GetServices: IN" ); - CCchServiceImpl* cchServiceImpl = NULL; - CArrayFixFlat* cchServices; - cchServices = new (ELeave) CArrayFixFlat(1); - CleanupStack::PushL( cchServices ); - error = GetCchServicesL( 0, aType, *cchServices ); - if( KErrNone == error ) - { - for ( TInt i = 0; i < cchServices->Count(); i++ ) - { - TCCHService service = cchServices->At( i ); - TInt idx =idx = FindService( service.iServiceId ); - if( idx == KErrNotFound ) - { - cchServiceImpl = CCchServiceImpl::NewL( *this, service.iServiceId, - *iCchUi ); - error = iCchServiceImpls.Append( cchServiceImpl ); - if( error == KErrNone ) - { - cchServiceImpl = iCchServiceImpls[ iCchServiceImpls.Count() - 1 ]; - } - else - { - delete cchServiceImpl; - cchServiceImpl = NULL; - } - } - else - { - cchServiceImpl = iCchServiceImpls[ idx ]; - } - error = aServices.Append( cchServiceImpl ); - if( error ) - { - delete cchServiceImpl; - cchServiceImpl = NULL; - } - } - } - cchServices->Reset(); - CleanupStack::PopAndDestroy( cchServices ); - CCHLOGSTRING( "CCchImpl::GetServices: OUT" ); - User::LeaveIfError( error ); - } + { + TInt error = KErrNone; + TServiceSelection selection( 0, aType, ECchInitial ); + CCHLOGSTRING( "CCchImpl::GetServices: IN" ); + CCchServiceImpl* cchServiceImpl = NULL; + CArrayFixFlat* cchServices; + cchServices = new (ELeave) CArrayFixFlat(1); + CleanupStack::PushL( cchServices ); + error = GetCchServicesL( 0, aType, *cchServices ); + if( KErrNone == error ) + { + for ( TInt i = 0; i < cchServices->Count(); i++ ) + { + TCCHService service = cchServices->At( i ); + TInt idx = FindService( service.iServiceId ); + if( idx == KErrNotFound ) + { + cchServiceImpl = CCchServiceImpl::NewL( *this, service.iServiceId, + *iCchUi ); + error = iCchServiceImpls.Append( cchServiceImpl ); + if( error == KErrNone ) + { + cchServiceImpl = iCchServiceImpls[ iCchServiceImpls.Count() - 1 ]; + } + else + { + delete cchServiceImpl; + cchServiceImpl = NULL; + } + } + else + { + cchServiceImpl = iCchServiceImpls[ idx ]; + } + error = aServices.Append( cchServiceImpl ); + if( error ) + { + delete cchServiceImpl; + cchServiceImpl = NULL; + } + } + } + cchServices->Reset(); + CleanupStack::PopAndDestroy( cchServices ); + CCHLOGSTRING( "CCchImpl::GetServices: OUT" ); + User::LeaveIfError( error ); + } // --------------------------------------------------------------------------- // CCCHServiceHandler::FindService