diff -r 40a3f856b14d -r 41a7f70b3818 phoneapp/phoneuistates/inc/cphoneconferenceandwaitingandcallsetup.h
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandwaitingandcallsetup.h	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandwaitingandcallsetup.h	Tue Aug 31 15:14:29 2010 +0300
@@ -64,13 +64,6 @@
             TPhoneKeyEventMessages aMessage,
             TKeyCode aCode );
      
-        /**
-        * HandleError
-        * Implements error handling framework
-        * @param aErrorInfo: the error info
-        */
-        IMPORT_C virtual void HandleErrorL( 
-            const TPEErrorInfo& aErrorInfo ); 
 
     protected:
 
@@ -85,9 +78,7 @@
         /**
         * ConstructL()
         */
-        virtual void ConstructL();
-        
-        virtual void OpenMenuBarL();        
+        virtual void ConstructL();   
 
         virtual void UpdateInCallCbaL();
         
@@ -98,19 +89,19 @@
         
      private:
 
-		void HandleConnectingL( TInt aCallId );
-		
-		void HandleConnectedL( TInt aCallId );
-		
-		void UpdateConnectingCbaL();
-		
+        void HandleConnectingL( TInt aCallId );
+        
+        void HandleConnectedL( TInt aCallId );
+        
+        void UpdateConnectingCbaL();
+        
      private:
          
          /**
          * Status of ConferenceAndWaitingAndCallSetup alerting
          */
          TBool iAlerting;
-		
+        
     };
 
 #endif // CPHONECONFERENCEANDWAITINGANDCALLSETUP_H