--- a/phoneapp/phoneuistates/src/cphoneconference.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconference.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -260,13 +260,7 @@
 //
 void CPhoneConference::UpdateInCallCbaL()
     {
-// <-- QT PHONE START -->
-    //if ( iViewCommandHandle->HandleCommandL( EPhoneViewIsConferenceInExpandedMode ) 
-    //    != EPhoneViewResponseSuccess )
-    //    {
     UpdateCbaL( EPhoneCallHandlingInCallCBA );
-    //    }
-// <-- QT PHONE END -->    
     }
 
 // -----------------------------------------------------------
@@ -497,9 +491,7 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConference::HandleHeldConferenceL()");
     TPhoneCmdParamCallHeaderData callHeaderParam;
-    // <-- QT PHONE START --> 
     callHeaderParam.SetCallState( EPEStateHeldConference );
-    // <-- QT PHONE END -->
     
     TInt callLabelId;
     TBuf<KPhoneCallHeaderLabelMaxLength> labelText( KNullDesC );
@@ -524,9 +516,7 @@
         }
     
     SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
-    // <-- QT PHONE START --> 
     SetTouchPaneButtons( EPhoneConferenceButtons );
-    // <-- QT PHONE END -->
     UpdateInCallCbaL();
     }
 
@@ -581,9 +571,7 @@
         "CPhoneConference::HandleConnectedConferenceL()");
     // Update call state
     TPhoneCmdParamCallHeaderData callHeaderParam;
-    // <-- QT PHONE START -->
     callHeaderParam.SetCallState( EPEStateConnectedConference );
-    // <-- QT PHONE END -->
     
     TBuf<KPhoneCallHeaderLabelMaxLength> conferenceText( KNullDesC );
     TInt callLabelId = CPhoneMainResourceResolver::Instance()->
@@ -609,9 +597,7 @@
         }
     
     SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );
-    // <-- QT PHONE START --> 
     SetTouchPaneButtons( EPhoneConferenceButtons );
-    // <-- QT PHONE END -->
     
     UpdateInCallCbaL();
     }
@@ -950,12 +936,10 @@
     // Check if HW Keys or Call UI should be disabled
     CheckDisableHWKeysAndCallUIL();
     
-// <-- QT PHONE START -->
     // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam );
     
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
-// <-- QT PHONE END -->
 
     EndUiUpdate();