diff -r ba76fc04e6c2 -r 6b911d05207e phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp --- a/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp Fri Jun 04 10:19:18 2010 +0100 +++ b/phoneapp/phoneuicontrol/src/cphonekeyeventforwarder.cpp Wed Jun 23 18:12:20 2010 +0300 @@ -210,46 +210,6 @@ return alphaNumeric; } -// ----------------------------------------------------------------------------- -// CPhoneKeyEventForwarder::ConvertHalfQwertySpecialChar -// ----------------------------------------------------------------------------- -// -TBool CPhoneKeyEventForwarder::ConvertHalfQwertySpecialChar( TUint& aCode, - const TKeyEvent& aKeyEvent ) - { - __LOGMETHODSTARTEND( EPhoneControl, - "CPhoneKeyEventForwarder::ConvertHalfQwertySpecialChar"); - - TBool ret( EFalse ); - TInt keyboard(KErrNotFound); - - if( keyboard == EPtiKeyboardHalfQwerty ) - { - switch ( aKeyEvent.iScanCode ) - { - case EStdKeyLeftShift: - ret = ETrue; - aCode = KPhoneDtmfHashCharacter; - break; - case EStdKeyLeftFunc: - ret = ETrue; - aCode = KPhoneDtmfStarCharacter; - break; - case EStdKeySpace: - ret = ETrue; - aCode = KPhoneDtmf0Character; - break; - default: - break; - } - } - - __PHONELOG1( EBasic, EPhoneControl, - "CPhoneKeyEventForwarder::ConvertHalfQwertySpecialChar =%d ", - ret ); - - return ret; - } // ----------------------------------------------------------------------------- // CPhoneKeyEventForwarder::OfferKeyEventBeforeControlStackL @@ -503,8 +463,6 @@ "CPhoneKeyEventHandler::ConvertKeyCode scan code (%d)", aKeyEvent.iScanCode ); - if( !ConvertHalfQwertySpecialChar( aCode, aKeyEvent ) ) - { switch ( aKeyEvent.iScanCode ) { case EStdKeyEnter: @@ -532,8 +490,7 @@ default: aCode = aKeyEvent.iScanCode; // Use default code break; - } - } + } //switch __PHONELOG1( EBasic, EPhoneControl, "CPhoneKeyEventHandler::ConvertKeyCode aCode (%d)", aCode );