diff -r 5a1685599b76 -r 8152b1f1763a fep/aknfep/src/AknFepUiManagerChinese.cpp --- a/fep/aknfep/src/AknFepUiManagerChinese.cpp Wed Sep 15 12:34:44 2010 +0300 +++ b/fep/aknfep/src/AknFepUiManagerChinese.cpp Wed Oct 13 14:55:58 2010 +0300 @@ -123,9 +123,6 @@ #include //phrase creation #include -#include "aknfepuiinputminiqwertysogoupinyinphraseplugin.h" -#include "aknfepuiinputminiqwertysogoustrokephraseplugin.h" - // CONSTANTS const TInt16 KStrokeHorizontalValue = 0x4e00; const TInt16 KStrokeVerticalValue = 0x4e28; @@ -136,16 +133,12 @@ const TInt16 KStrokeUnicode = 0x2461; const TInt16 KZhuyinIndicator = 0x2462; const TInt16 KPinyinIndicator = 0x2460; -//const TInt16 KStrokeIndicator = 0x2461; const TInt16 KCanjieIndicator = 0x2463; const TInt16 KChineseTone1 = 0x02c9; const TInt16 KChineseTone2 = 0x02ca; const TInt16 KChineseTone3 = 0x02c7; const TInt16 KChineseTone4 = 0x02cb; const TInt16 KChineseTone0 = 0x02d9; - -const TUid KPtiSogouCoreUid = { 0x20031DD6 }; - /** * CAknFepUIManagerChinese class. * @@ -1174,11 +1167,6 @@ #ifdef RD_INTELLIGENT_TEXT_INPUT TPtiKeyboardType kbdType = iFepMan->KeyboardLayout(); #endif - - // Get current core id. It is used to judge whether sogou core is in use. - TInt coreID = 0; - TRAP_IGNORE( coreID = PtiEngine()->HandleCommandL( EPtiCommandGetCoreID )); - switch(aState) { case EQwerty: @@ -1311,14 +1299,6 @@ { iFepUiState = TAknFepInputStateEntryMiniQwertyStrokePhrase( this, iContainerPane); - // If sogou core is in use, set plugin to the state - // machine and enable the plugin. - if ( TUid::Uid( coreID ) == KPtiSogouCoreUid ) - { - TAknFepInputMiniQwertySogouStrokePhrasePlugin plugin( this, iContainerPane, EEntry ); - plugin.Enable( ETrue ); - iFepUiState.SetStrokePlugin( plugin ); - } } else if (EPtiKeyboardHalfQwerty == kbdType) { @@ -1421,15 +1401,7 @@ EPtiKeyboardCustomQwerty == kbdType) { iFepUiState = TAknFepUiInputStateCandidateMiniQwertyStrokePhrase(this, iContainerPane); - // If sogou core is in use, set plugin to the state - // machine and enable the plugin. - if ( TUid::Uid( coreID ) == KPtiSogouCoreUid ) - { - TAknFepInputMiniQwertySogouStrokePhrasePlugin plugin( this, iContainerPane, ECandidate ); - plugin.Enable( ETrue ); - iFepUiState.SetStrokePlugin( plugin ); - } - } + } else if ( EPtiKeyboardHalfQwerty == kbdType ) { iFepUiState=TAknFepUiInputStateCandidateHalfQwertyChinesePhrase( this, iContainerPane); @@ -1496,15 +1468,6 @@ { iFepUiState = TAknFepInputStatePredictiveCandidateMiniQwertyChinesePhrase( this, iContainerPane); - - // If sogou core is in use, set plugin to the state - // machine and enable the plugin. - if ( TUid::Uid( coreID ) == KPtiSogouCoreUid ) - { - TAknFepInputMiniQwertySogouPinyinPhrasePlugin plugin( this, iContainerPane, EPredictiveCandidate ); - plugin.Enable( ETrue ); - iFepUiState.SetPlugin( plugin ); - } } #ifdef __HALF_QWERTY_KEYPAD else if( EPtiKeyboardHalfQwerty == kbdType ) @@ -1526,14 +1489,6 @@ iFepUiState = TAknFepInputStatePredictiveCandidateMiniQwertyChinesePhrase( this, iContainerPane); - // If sogou core is in use, set plugin to the state - // machine and enable the plugin. - if ( TUid::Uid( coreID ) == KPtiSogouCoreUid ) - { - TAknFepInputMiniQwertySogouStrokePhrasePlugin plugin( this, iContainerPane, EPredictiveCandidate ); - plugin.Enable( ETrue ); - iFepUiState.SetStrokePlugin( plugin ); - } } #ifdef __HALF_QWERTY_KEYPAD else if( EPtiKeyboardHalfQwerty == kbdType ) @@ -1574,15 +1529,6 @@ EPtiKeyboardCustomQwerty == kbdType) { iFepUiState = TAknFepInputStatePredictiveInputMiniQwertyChinesePhrase/*TAknFepInputStatePredictiveInputQwertyPinyinPhrase*/(this, iContainerPane); - - // If sogou core is in use, set plugin to the state - // machine and enable the plugin. - if ( TUid::Uid( coreID ) == KPtiSogouCoreUid ) - { - TAknFepInputMiniQwertySogouPinyinPhrasePlugin plugin( this, iContainerPane, EPredictiveInput ); - plugin.Enable( ETrue ); - iFepUiState.SetPlugin( plugin ); - } } else { @@ -1610,15 +1556,7 @@ { iFepUiState = TAknFepInputStatePredictiveInputMiniQwertyChinesePhrase( this, iContainerPane); - // If sogou core is in use, set plugin to the state - // machine and enable the plugin. - if ( TUid::Uid( coreID ) == KPtiSogouCoreUid ) - { - TAknFepInputMiniQwertySogouStrokePhrasePlugin plugin( this, iContainerPane, EPredictiveInput ); - plugin.Enable( ETrue ); - iFepUiState.SetStrokePlugin( plugin ); - } - } + } else { #endif @@ -1733,15 +1671,6 @@ TAknFepInputStateEditingMiniQwertyStrokePhrase( this, iContainerPane); - - // If sogou core is in use, set plugin to the state - // machine and enable the plugin. - if ( TUid::Uid( coreID ) == KPtiSogouCoreUid ) - { - TAknFepInputMiniQwertySogouStrokePhrasePlugin plugin( this, iContainerPane, EMiniQwertyEdit ); - plugin.Enable( ETrue ); - iFepUiState.SetStrokePlugin( plugin ); - } } #endif }