--- a/phoneapp/phoneuistates/inc/cphoneconference.h	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuistates/inc/cphoneconference.h	Tue Aug 31 15:14:29 2010 +0300
@@ -65,12 +65,6 @@
         virtual void HandleKeyMessageL(
             TPhoneKeyEventMessages aMessage,
             TKeyCode aCode );
-        
-        /**
-        * This function is called from displaycallsetup and 
-        * the purpose is to do state specific things for callsetup.
-        */
-        IMPORT_C virtual void DoStateSpecificCallSetUpDefinitionsL();
             
     protected:
 
@@ -92,8 +86,6 @@
             TEventCode aEventCode );
             
         virtual void HandleNumberEntryClearedL();
-        
-        virtual void OpenMenuBarL();
 
         virtual void HandleIdleL( TInt aCallId );
         
@@ -108,48 +100,29 @@
         virtual void HandleConferenceIdleL();
                         
         virtual void MakeStateTransitionToTwoSinglesL();
-        
-        virtual TBool IsConferenceBubbleInSelectionMode() const;
+
+        virtual void DisplayCallSetupL( TInt aCallId );
         
         virtual void UpdateInCallCbaL();
-        
-        void CloseSelectionListL();
-        
-        virtual void SetHoldFlagL();
-        
-        virtual void DefineAndSetHoldFlagL();
-  
-        virtual void HandleCreateNumberEntryL( 
-			const TKeyEvent& aKeyEvent,
-            TEventCode aEventCode );
 
         void UpdateConferenceSecurityStatusL( TInt aCallId );
-		
-        virtual void DisconnectCallL();
+        
         
      private:
-              
-        void OpenParticipantsListL();
      
         void HandleHeldConferenceL( TInt aCallId );
          
         void HandleConnectedConferenceL();
 
         void ToggleHoldL();
-
-        void OpenDropParticipantSelectionL();
         
         void DropSelectedParticipantL();
         
-        void OpenPrivateSelectionL();
-        
         void PrivateSelectedParticipantL();
         
         void MakeStateTransitionToIdleL();
         
-        void HandleDialingL( TInt aCallId );
-              
-        void CallFromNewCallQueryL();
+        void HandleDiallingL( TInt aCallId );
         
         void HandleWentOneToOneL( TInt aCallId );