--- a/phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h	Tue Aug 31 15:14:29 2010 +0300
@@ -61,21 +61,17 @@
         virtual void HandleKeyMessageL(
             TPhoneKeyEventMessages aMessage,
             TKeyCode aCode );
-     
+            
+        virtual void HandleKeyEventL(
+            const TKeyEvent& aKeyEvent,
+            TEventCode aEventCode );
+
         /**
-        * HandleError
-        * Implements error handling framework
-        * @param aErrorInfo: the error info
-        */
-        IMPORT_C virtual void HandleErrorL( 
-            const TPEErrorInfo& aErrorInfo ); 
-        
-        /**
-        * This function is called from displaycallsetup and 
-        * the purpose is to do state specific things for callsetup.
-        */
-        IMPORT_C virtual void DoStateSpecificCallSetUpDefinitionsL();
-        
+        * Handles user selected UI commands.
+        * @param aCommand - selected command
+        */    
+        TBool HandleCommandL( TInt aCommand );
+
     protected:
 
         /**
@@ -91,8 +87,6 @@
         */
         virtual void ConstructL();
         
-        virtual void OpenMenuBarL();
-        
         virtual void UpdateInCallCbaL();
         
         
@@ -106,9 +100,14 @@
                   
          void MakeStateTransitionToConferenceAndSingleL( TInt aCallId );
          
-         void HandleDialingL( TInt aCallId );
+         void HandleDiallingL( TInt aCallId );
          
          void HandleWentOneToOneL( TInt aCallId );
+         
+         /**
+          *  Handles received EPhoneCmdUpdateUiControls command.
+          */
+         void UpdateUiControlsL();
       
      private:
         TInt iRingingCallId;