diff -r 40a3f856b14d -r 41a7f70b3818 phoneapp/phoneuistates/inc/cphoneconferenceandsingleandwaiting.h
--- a/phoneapp/phoneuistates/inc/cphoneconferenceandsingleandwaiting.h	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconferenceandsingleandwaiting.h	Tue Aug 31 15:14:29 2010 +0300
@@ -62,13 +62,9 @@
             TPhoneKeyEventMessages aMessage,
             TKeyCode aCode );
 
-        /**
-        * HandleError
-        * Implements error handling framework
-        * @param aErrorInfo: the error info
-        */
-        IMPORT_C virtual void HandleErrorL( 
-            const TPEErrorInfo& aErrorInfo ); 
+        virtual void HandleKeyEventL( 
+            const TKeyEvent& aKeyEvent,
+            TEventCode aEventCode );
         
     protected:
 
@@ -85,8 +81,6 @@
         */
         virtual void ConstructL();
         
-        virtual void OpenMenuBarL();
-        
         virtual void HandleIdleL( TInt aCallId );
         
         virtual void HandleConferenceIdleL();