convergedcallengine/cce/src/ccceconferencecall.cpp
branchRCL_3
changeset 44 987c9837762f
parent 43 7d48bed6ce0c
--- a/convergedcallengine/cce/src/ccceconferencecall.cpp	Tue Aug 31 15:45:17 2010 +0300
+++ b/convergedcallengine/cce/src/ccceconferencecall.cpp	Wed Sep 01 12:15:03 2010 +0100
@@ -194,7 +194,7 @@
 
         iConferenceCall = iPluginManager.GetPluginL(
             call->ImplementationUid() )->NewConferenceL( ServiceId(), *this );
-            
+			
         if(iConferenceCall)
             {
             iConferenceCall->AddCallL( &call->GetCCPCall() );
@@ -286,11 +286,10 @@
         
         for( TInt i = 0; i < array.Count(); i++ )
             {
-            // *call ownership is not transfered.
             const CCCECall* call = iCallContainer.GetCall( array[i] );
             
             // Check if cce call matching to ccp call is available
-            iCallArray.Append( call ); // Ignore return value;
+            iCallArray.Append( call );
             iCallParameters->SetServiceId( call->ServiceId() );
                 
             CCELOGSTRING("CCCEConferenceCall:: Call added to conferencecall");
@@ -391,12 +390,14 @@
 TInt CCCEConferenceCall::GetCallArray( RPointerArray<MCCECall>& aCallArray )
     {
     TInt err( KErrNotFound );
-    TInt count = iCallArray.Count();
-    aCallArray.Reserve(count);
-    for (TInt a = 0; a < count; a++)
+    
+    for (TInt a = 0; a < iCallArray.Count(); a++)
         {
-        err= aCallArray.Append( iCallArray[a] );
+        aCallArray.Append( iCallArray[a] );
+        err = KErrNone;
         }
+
+    
     return err;
     }
 
@@ -630,8 +631,8 @@
 // ---------------------------------------------------------------------------
 // 
 TTimeIntervalSeconds CCCEConferenceCall::CallDuration() const
-    {
+	{
     return iCCEDurationTimer->NumberOfBeats();
-    }
+	}
     
 // End of file