diff -r 5a1685599b76 -r 8152b1f1763a textinput/ptienginev2/src/PtiEngineImpl.cpp --- a/textinput/ptienginev2/src/PtiEngineImpl.cpp Wed Sep 15 12:34:44 2010 +0300 +++ b/textinput/ptienginev2/src/PtiEngineImpl.cpp Wed Oct 13 14:55:58 2010 +0300 @@ -747,19 +747,6 @@ delete oldTextBuf; } } - else - { - // call CPtiKoreanQwertyCore::LoadKeyboards() by OpenLanguageL() again, - // make sure that in hardware Qwerty, product keymappings can be used correctly. - if ( aNewMode == EPtiEngineQwertyKorean ) - { - CPtiCore* core = static_cast(iCurrentLanguage->GetCore( aNewMode )); - if ( core ) - { - TRAP_IGNORE( core->OpenLanguageL( iCurrentLanguage ) ); - } - } - } } // --------------------------------------------------------------------------- @@ -781,7 +768,6 @@ return KErrNoSuitableCore; } - // --------------------------------------------------------------------------- // Group Unicode is that kind of mapping which one visible character with more // than one unicode submitted. @@ -803,7 +789,7 @@ { aResult.Append(aKey); } - } + } // --------------------------------------------------------------------------- @@ -895,7 +881,7 @@ IsGroupUnicodeExist(aKey, mappings, 0); if(mappings.Length() == 1) { - Core()->AppendKeyPress(aKey); + Core()->AppendKeyPress(aKey); } else { @@ -1169,7 +1155,7 @@ TPtrC CPtiEngineImpl::RedirectKeyForChineseQwerty(TPtiKey aKey, TBool& aRedirected) { aRedirected = EFalse; - TPtiKeyboardType kbdType = KeyboardType(); + TPtiKeyboardType kbdType = KeyboardType(); TBuf data; TInt key; @@ -2473,25 +2459,13 @@ // void CPtiEngineImpl::LoadCoresInDefaultDirL(TBool aUseDefaultUserDictionary) { - TUid KPtiSogouCoreUid = { 0x20031DD7 }; - TInt i = 0; - TInt postponed = -1; - CArrayFix* array = CPtiCore::ListCoresLC(); - User::LeaveIfNull(array); - for (i = 0; i < array->Count(); i++) - { - if (TUid::Uid(array->At(i)) == KPtiSogouCoreUid ) - { - postponed = i; - continue; - } - AddCoreL(TUid::Uid(array->At(i)), aUseDefaultUserDictionary); - } - - if (postponed >= 0) - { - AddCoreL(TUid::Uid(array->At(postponed)), aUseDefaultUserDictionary); - } + TInt i; + CArrayFix* array = CPtiCore::ListCoresLC(); + User::LeaveIfNull(array); + for (i = 0; i < array->Count(); i++) + { + AddCoreL(TUid::Uid(array->At(i)), aUseDefaultUserDictionary); + } CleanupStack::PopAndDestroy(); // array }