diff -r 2a5d4ab426d3 -r d1c62c765e48 phoneapp/phoneuistates/inc/cphoneconference.h --- a/phoneapp/phoneuistates/inc/cphoneconference.h Fri Sep 03 13:33:36 2010 +0300 +++ b/phoneapp/phoneuistates/inc/cphoneconference.h Fri Sep 17 17:09:12 2010 +0300 @@ -92,19 +92,11 @@ virtual void MakeStateTransitionToSingleL(); virtual void HandleIncomingL( TInt aCallId ); - - virtual void DisplayIncomingCallL( - TInt aCallId, - const TPhoneCmdParamBoolean aCommandParam ); virtual void HandleConferenceIdleL(); virtual void MakeStateTransitionToTwoSinglesL(); - virtual void DisplayCallSetupL( TInt aCallId ); - - virtual void UpdateInCallCbaL(); - void UpdateConferenceSecurityStatusL( TInt aCallId ); @@ -122,7 +114,7 @@ void MakeStateTransitionToIdleL(); - void HandleDiallingL( TInt aCallId ); + void HandleDialingL( TInt aCallId ); void HandleWentOneToOneL( TInt aCallId );