diff -r c84cf270c54f -r 92ab7f8d0eab phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp
--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp	Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp	Fri Mar 19 09:28:42 2010 +0200
@@ -34,7 +34,7 @@
 #include "phoneui.hrh"
 #include "mphonestorage.h"
 #include "cphonecenrepproxy.h"
-#include <TelephonyVariant.hrh>
+#include <telephonyvariant.hrh>
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -62,8 +62,10 @@
         {
         TPhoneCmdParamBoolean dtmfSendFlag;
         dtmfSendFlag.SetBoolean( EFalse );
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, 
-    	&dtmfSendFlag );
+// <-- QT PHONE START -->
+        iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag, 
+            &dtmfSendFlag );
+// <-- QT PHONE END -->
         }
     }
 
@@ -139,7 +141,7 @@
     TPhoneCmdParamBoolean dtmfSendFlag;
     dtmfSendFlag.SetBoolean( ETrue );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, 
-    	&dtmfSendFlag );
+        &dtmfSendFlag );
   
 
     TPhoneCmdParamCallStateData callStateData;
@@ -384,7 +386,7 @@
 
     MakeTransitionAccordingToActiveCallsL();
     
-    EndUiUpdate();    	    
+    EndUiUpdate();          
     }
 
 // --------------------------------------------------------------
@@ -402,15 +404,15 @@
         // send-key
         case EKeyYes:
             if( IsNumberEntryVisibleL() )
- 				{
-                CallFromNumberEntryL();    	 					
- 				}
- 			else
-	 			{
+                {
+                CallFromNumberEntryL();                         
+                }
+            else
+                {
                 // Not allowed to answer
                 SendGlobalWarningNoteL( 
-                    EPhoneNoteTextCallNotAllowed );		 				
-	 			}
+                    EPhoneNoteTextCallNotAllowed );                     
+                }
             break;
             
         default:
@@ -426,7 +428,7 @@
 //
 void CPhoneConferenceAndSingleAndWaiting::HandleKeyEventL(
     const TKeyEvent& aKeyEvent,
-    TEventCode aEventCode )
+    TEventCode /*aEventCode*/ )
     {
     if( EKeyDeviceF == aKeyEvent.iCode )
         {