diff -r 41a7f70b3818 -r 5266b1f337bd phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h	Tue Aug 31 15:14:29 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandwaiting.h	Wed Sep 01 12:30:10 2010 +0100
@@ -61,17 +61,21 @@
         virtual void HandleKeyMessageL(
             TPhoneKeyEventMessages aMessage,
             TKeyCode aCode );
-            
-        virtual void HandleKeyEventL(
-            const TKeyEvent& aKeyEvent,
-            TEventCode aEventCode );
-
+     
         /**
-        * Handles user selected UI commands.
-        * @param aCommand - selected command
-        */    
-        TBool HandleCommandL( TInt aCommand );
-
+        * 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();
+        
     protected:
 
         /**
@@ -87,6 +91,8 @@
         */
         virtual void ConstructL();
         
+        virtual void OpenMenuBarL();
+        
         virtual void UpdateInCallCbaL();
         
         
@@ -100,14 +106,9 @@
                   
          void MakeStateTransitionToConferenceAndSingleL( TInt aCallId );
          
-         void HandleDiallingL( TInt aCallId );
+         void HandleDialingL( TInt aCallId );
          
          void HandleWentOneToOneL( TInt aCallId );
-         
-         /**
-          *  Handles received EPhoneCmdUpdateUiControls command.
-          */
-         void UpdateUiControlsL();
       
      private:
         TInt iRingingCallId;