--- a/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp Thu Jul 15 18:38:16 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandcallsetupandwaiting.cpp Thu Aug 19 09:54:27 2010 +0300
@@ -120,18 +120,17 @@
{
// send-key
case EKeyYes:
- if( IsNumberEntryVisibleL() )
- {
- CPhoneState::CallFromNumberEntryL();
- }
- else
- {
- // Number entry is behind waiting call bubble
- // We can't answer to waiting call in this state
- // so display Not allowed -note.
- CPhoneState::SendGlobalErrorNoteL(
- EPhoneNoteTextNotAllowed );
- }
+ if( IsNumberEntryVisibleL() )
+ {
+ CPhoneState::CallFromNumberEntryL();
+ }
+ else
+ {
+ // Number entry is behind waiting call bubble
+ // We can't answer to waiting call in this state
+ // so display Not allowed -note.
+ CPhoneState::SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed );
+ }
break;
// end-key
@@ -174,7 +173,7 @@
else
{
// handle end key
- DisconnectOutgoingCallL();
+ DisconnectOutgoingCallL();
}
break;
@@ -597,7 +596,7 @@
// CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL
// -----------------------------------------------------------
//
-void CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL( TInt aCallId )
+void CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL( TInt /*aCallId*/ )
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesL()");
@@ -618,7 +617,7 @@
// CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL
// -----------------------------------------------------------
//
-void CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL( TInt aCallId )
+void CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL( TInt /*aCallId*/ )
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneSingleAndCallSetupAndWaiting::StateChangeToTwoSinglesAndWaitingL()");