diff -r 7119b73b84d6 -r e52d42f9500c logsui/logscntfinder/src/logspredictivethai12keytranslator.cpp --- a/logsui/logscntfinder/src/logspredictivethai12keytranslator.cpp Fri May 14 15:52:41 2010 +0300 +++ b/logsui/logscntfinder/src/logspredictivethai12keytranslator.cpp Thu May 27 12:51:53 2010 +0300 @@ -19,6 +19,7 @@ #include #include #include +#include #include "logspredictivethai12keytranslator.h" #include "logslogger.h" @@ -27,26 +28,35 @@ const int IgnoreCount = 2; + + // ----------------------------------------------------------------------------- // LogsPredictiveThai12KeyTranslator::LogsPredictiveThai12KeyTranslator() // ----------------------------------------------------------------------------- // LogsPredictiveThai12KeyTranslator::LogsPredictiveThai12KeyTranslator() - : LogsPredictive12KeyTranslator() + : LogsPredictive12KeyTranslator( QLocale::Thai ) { LOGS_QDEBUG( "logs [FINDER] -> LogsPredictiveThai12KeyTranslator::\ LogsPredictiveThai12KeyTranslator()" ) - HbInputLanguage lang = - HbInputSettingProxy::instance()->globalInputLanguage(); - ASSERT( lang.language() == QLocale::Thai ); - mKeyMap = HbKeymapFactory::instance()->keymap( lang.language(), - lang.variant() ); - - LOGS_QDEBUG( "logs [FINDER] <- LogsPredictiveThai12KeyTranslator::\ LogsPredictiveThai12KeyTranslator()" ) } +// ----------------------------------------------------------------------------- +// LogsPredictiveThai12KeyTranslator::LogsPredictiveThai12KeyTranslator() +// ----------------------------------------------------------------------------- +// +LogsPredictiveThai12KeyTranslator::LogsPredictiveThai12KeyTranslator( + const HbInputLanguage& lang ) + : LogsPredictive12KeyTranslator( lang ) +{ + LOGS_QDEBUG( "logs [FINDER] -> LogsPredictiveThai12KeyTranslator::\ +LogsPredictiveThai12KeyTranslator()" ) + ASSERT( lang.language() == QLocale::Thai ); + LOGS_QDEBUG( "logs [FINDER] <- LogsPredictiveThai12KeyTranslator::\ +LogsPredictiveThai12KeyTranslator()" ) +} // ----------------------------------------------------------------------------- // LogsPredictiveThai12KeyTranslator::~LogsPredictiveThai12KeyTranslator() @@ -66,11 +76,14 @@ // ----------------------------------------------------------------------------- // const QChar LogsPredictiveThai12KeyTranslator::translateChar( - const QChar character ) const + const QChar character, + bool& ok ) const { + ok = true; QChar keycode; if ( !isIgnored( character ) ) { keycode = LogsPredictive12KeyTranslator::translateChar( character ); + ok = !keycode.isNull(); keycode = !keycode.isNull() && !isIgnored( keycode ) ? keycode : QChar(); } @@ -102,8 +115,3 @@ } return found; } - - - - -