diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp
--- a/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -336,7 +336,6 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneTwoSinglesAndWaiting::StateTransitionToSingleAndWaitingL()");
     // Go to two singles state
-    // <-- QT PHONE START -->    
     TPhoneCmdParamInteger callIdParam;
     iViewCommandHandle->ExecuteCommandL( 
             EPhoneViewGetExpandedBubbleCallId, &callIdParam );
@@ -349,7 +348,6 @@
         {
         iCbaManager->SetCbaL( EPhoneCallHandlingCallWaitingCBA );
         }
-    // <-- QT PHONE END -->    
   
     // Set touch controls
     SetTouchPaneButtonEnabled( EPhoneCallComingCmdAnswer );
@@ -383,11 +381,9 @@
         conferenceText, 
         callLabelId, 
         CCoeEnv::Static() );        
-// <-- QT PHONE START --> 
     callHeaderParam.SetCLIText( conferenceText, TPhoneCmdParamCallHeaderData::ERight );
     
     callHeaderParam.SetCallState(EPEStateConnectedConference);
-// <-- QT PHONE END --> 
     
     callHeaderParam.SetCiphering(
         iStateMachine->PhoneEngineInfo()->IsSecureCall( aCallId ) );
@@ -395,7 +391,6 @@
     callHeaderParam.SetCipheringIndicatorAllowed(
         iStateMachine->PhoneEngineInfo()->SecureSpecified() );
 
-// <-- QT PHONE START -->
     // Service identifier must be given so that service specific settings
     // can be taken into account at phoneuiview.
     callHeaderParam.SetServiceId( 
@@ -420,7 +415,6 @@
     
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
     
-// <-- QT PHONE END -->
     EndUiUpdate();
     // Go to Conference And Waiting state
     // No need for CBA update
@@ -436,7 +430,6 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneTwoSinglesAndWaiting::UpdateInCallCbaL()");
 
-// <-- QT PHONE START -->    
     TPhoneCmdParamInteger callIdParam;
     iViewCommandHandle->ExecuteCommandL( 
             EPhoneViewGetExpandedBubbleCallId, &callIdParam );
@@ -449,7 +442,6 @@
         {
         iCbaManager->SetCbaL( EPhoneCallHandlingIncomingSoftRejectCBA );
         }
-// <-- QT PHONE END -->    
     }
 
 // -----------------------------------------------------------
@@ -463,7 +455,6 @@
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
     }
 
-// <-- QT PHONE START -->
 // -----------------------------------------------------------
 // CPhoneTwoSinglesAndWaiting::HandleCommandL
 // -----------------------------------------------------------
@@ -498,7 +489,4 @@
     UpdateInCallCbaL();
     }
 
-// <-- QT PHONE END -->
-
-
 // End of File