FCL/sf/mw/classicui: comparison uifw/AvKon/src/AknPhoneNumberEditor.cpp

equal deleted inserted replaced

-:85902f042028
+:a5e7a4f63858
 #include <AknTasHook.h>
 #include <touchfeedback.h>
 #include <aknnotedialog.h>
-#include <e32property.h>
-#include <AvkonInternalCRKeys.h>        // for checking qwerty availability
 static const TInt KPlainTextPos = 0;
 typedef CArrayFixFlat<CAknPhoneNumberEditor::TFormat> CFormatArray;
 NONSHARABLE_CLASS( CAknPhoneNumberEditorExtension ) : public CBase,
 CFormatArray* iFormats;
 CAknExtendedInputCapabilities* iExtendedInputCapabilities;
 TInt iPointPos;
 CAknCcpuSupport* iCcpuSupport;
 HBufC* iPasteText;
-TBool iQwertyAllowed;
-TBool iHybridModeAllowed;
 };
 CAknPhoneNumberEditorExtension::CAknPhoneNumberEditorExtension()
 {
 iFormats = NULL;
 {
 iExtension->iCcpuSupport->HandleSelectionChangeL();
 }
 if ( cousorChanged )
 	{
-ReportAknEdStateEvent( MAknEdStateObserver::EAknCursorPositionChanged );
+ReportAknEdStateEventL( MAknEdStateObserver::EAknCursorPositionChanged );
 	}
 // see if we want to remember the old cursor X position
 if ( targetPosUsed )
 {
 if ( iTargetCursorPos == CAknPhedView::KNoPos )
 {
 TRAP_IGNORE( iExtension->iCcpuSupport->HandleFocusChangeL() );
 }
 if ( ! IsFocused() )
 {
-ReportAknEdStateEvent( MAknEdStateObserver::EAknSyncEdwinState );
+TRAP_IGNORE( ReportAknEdStateEventL( MAknEdStateObserver::EAknSyncEdwinState ) );
 }
 if ( aDrawNow )
 DrawNow();
 }
 iView->Draw( SystemGc(), iFlags[ERedrawAll], this );
 }
 EXPORT_C TCoeInputCapabilities CAknPhoneNumberEditor::InputCapabilities() const
 {
-if ( iExtension->iQwertyAllowed )
+if ( FeatureManager::FeatureSupported( KFeatureIdCommonVoip ) )
 {
 TCoeInputCapabilities inputCaps(
 TCoeInputCapabilities::EWesternAlphabetic |
 TCoeInputCapabilities::ENavigation,
 const_cast<CAknPhoneNumberEditor*>( this ), NULL );
-//iExtension->iExtendedInputCapabilities->SetEditorType(
-//    CAknExtendedInputCapabilities::EPhoneNumberEditor );
-TInt qwertyActive = 0;
-RProperty::Get( KCRUidAvkon, KAknQwertyInputModeActive, qwertyActive );
-if ( qwertyActive && iExtension->iHybridModeAllowed )
-{
-iExtension->iExtendedInputCapabilities->SetEditorType(
-CAknExtendedInputCapabilities::EHybridAlphaNumericEditor );
-}
-else
-{
-iExtension->iExtendedInputCapabilities->SetEditorType(
-CAknExtendedInputCapabilities::EPhoneNumberEditor );
-}
 // Voip-enabled phone editor wants to use edit-key style hash key mode selection.
+iExtension->iExtendedInputCapabilities->SetEditorType(
+CAknExtendedInputCapabilities::EPhoneNumberEditor );
 iExtension->iExtendedInputCapabilities->SetCapabilities(
 CAknExtendedInputCapabilities::EForceHashKeySelectionStatusFlagOff |
 CAknExtendedInputCapabilities::EForceEditSubmenuStatusFlagOff );
 inputCaps.SetObjectProvider(
 const_cast<CAknPhoneNumberEditorExtension*>( iExtension ) );
 EXPORT_C void CAknPhoneNumberEditor::SetSelectionL( TInt aCursorPos,TInt aAnchorPos )
 {
 iModel->SetRealCursorPosition(aCursorPos);
 iModel->SetAnchorPosition( aAnchorPos );
-ReportAknEdStateEvent(
+ReportAknEdStateEventL(
 MAknEdStateObserver::EAknCursorPositionChanged );
 }
 EXPORT_C void CAknPhoneNumberEditor::SetCursorPosL( TInt aCursorPos,TBool aSelect )
 {
 TInt anchor = iModel->AnchorPosition();
 iModel->SetRealCursorPosition( aCursorPos );
 if ( aSelect )
 iModel->SetAnchorPosition( anchor );
-ReportAknEdStateEvent(
+ReportAknEdStateEventL(
 MAknEdStateObserver::EAknCursorPositionChanged );
 }
 EXPORT_C void CAknPhoneNumberEditor::SelectAllL()
 {
 void CAknPhoneNumberEditor::SetCursorSelectionForFepL( const TCursorSelection& aCursorSelection )
 {
 iModel->SetRealCursorPosition( iModel->Uncompensate( aCursorSelection.iCursorPos ) );
 iModel->SetAnchorPosition( iModel->Uncompensate( aCursorSelection.iAnchorPos  ) );
-ReportAknEdStateEvent(
+ReportAknEdStateEventL(
 MAknEdStateObserver::EAknCursorPositionChanged );
 DrawNow();
 }
 void CAknPhoneNumberEditor::GetCursorSelectionForFep( TCursorSelection& aCursorSelection ) const
 //
 EXPORT_C TInt CAknPhoneNumberEditor::ChangeEditorMode( TBool aDefaultMode )
 {
 TInt value( EAknEditorNumericInputMode ); // Return value.
-if ( iExtension->iQwertyAllowed )
+if ( FeatureManager::FeatureSupported( KFeatureIdCommonVoip ) )
 {
 CAknEdwinState* fepState = ( CAknEdwinState* )iFepState;
 // Get current input mode.
 TInt currentInputMode = fepState->CurrentInputMode();
 fepState->SetCurrentCase( EAknEditorLowerCase );
 fepState->SetPermittedCases( EAknEditorLowerCase | EAknEditorUpperCase );
 fepState->SetSpecialCharacterTableResourceId( 0 );
 fepState->SetNumericKeymap( EAknEditorStandardNumberModeKeymap );
-iExtension->iQwertyAllowed = EFalse;
-iExtension->iHybridModeAllowed = EFalse;
 DrawChanges();
 }
-// --------------------------------------------------------------------------
-// CAknPhoneNumberEditor::SetQwertyAllowed
-// --------------------------------------------------------------------------
-//
-EXPORT_C void CAknPhoneNumberEditor::SetQwertyAllowed( TBool aQwertyAllowed )
-{
-iExtension->iQwertyAllowed = aQwertyAllowed;
-}
-// --------------------------------------------------------------------------
-// CAknPhoneNumberEditor::SetHybridModeAllowed
-// --------------------------------------------------------------------------
-//
-EXPORT_C void CAknPhoneNumberEditor::SetHybridModeAllowed( TBool aHybridModeAllowed )
-{
-iExtension->iHybridModeAllowed = aHybridModeAllowed;
-}
 // --------------------------------------------------------------------------
 // CAknPhoneNumberEditor::HandlePointerEventL
 // --------------------------------------------------------------------------
 //
 // CAknPhoneNumberEditor::CcpuPasteL
 // --------------------------------------------------------------------------
 //
 EXPORT_C void CAknPhoneNumberEditor::CcpuPasteL()
 {
-// When we paste the buffer to phone number editor, we must get the buffer from clipboard first
-// and then insert buffer to phone number editor. As the main job of CcpuCanPaste() is getting and
-// checking the buffer in clipboard, so we must call CcpuCanPaste() first.
-// If iExtension->iPasteText is not NULL, it means CcpuCanPaste() has been called before and the
-// buffer in clipboard is valid. No need to call it once again.
-if ( !iExtension->iPasteText )
-{
-// If the return value of CcpuCanPaste is EFalse, iExtension->iPasteText must be NULL,
-// else if the return value of CcpuCanPaste is ETure, iExtension->iPasteText must not be NULL.
-// So we don't need to check if the return value is ETure or EFalse,
-// we will check iExtension->iPasteText instead of that.
-CcpuCanPaste();
-}
 if ( iExtension->iPasteText )
 {
 iModel->Paste( iExtension->iPasteText->Des() );
 DrawNow();
 }
 EXPORT_C void CAknPhoneNumberEditor::OpenVKB( )
 {
 TUint cap = iExtension->iExtendedInputCapabilities->Capabilities();
 cap &= ~CAknExtendedInputCapabilities::EInputEditorDisableVKB;
 iExtension->iExtendedInputCapabilities->SetCapabilities( cap );
-ReportAknEdStateEvent(
+TRAP_IGNORE( ReportAknEdStateEventL(
-		     MAknEdStateObserver::EAknActivatePenInputRequest );
+		     MAknEdStateObserver::EAknActivatePenInputRequest ) );
 }
 // --------------------------------------------------------------------------
 // CAknPhoneNumberEditor::CloseVKB
 // --------------------------------------------------------------------------
 void CAknPhoneNumberEditor::CloseVKB( )
 {
 TUint cap = iExtension->iExtendedInputCapabilities->Capabilities();
 cap |= CAknExtendedInputCapabilities::EInputEditorDisableVKB;
 iExtension->iExtendedInputCapabilities->SetCapabilities( cap );
-ReportAknEdStateEvent( MAknEdStateObserver::EAknClosePenInputRequest );
+ReportAknEdStateEventL( MAknEdStateObserver::EAknClosePenInputRequest );
 }
 // --------------------------------------------------------------------------
 // CAknPhoneNumberEditor::ReportAknEdStateEventL
 // --------------------------------------------------------------------------
 //
-void CAknPhoneNumberEditor::ReportAknEdStateEvent(
+void CAknPhoneNumberEditor::ReportAknEdStateEventL(
 MAknEdStateObserver::EAknEdwinStateEvent aStateEvent )
 {
 CAknEdwinState* edwinState = STATIC_CAST( CAknEdwinState*,State(KNullUid) );
 if ( edwinState )
 {

branch	RCL_3
changeset 72	a5e7a4f63858
parent 59	978afdc0236f