Commit: 123b8aba3c0af487e8040ab00842f9e928363cde - uim (git)

A multilingual input method framework

Commit MetaInfo

• Revision: 123b8aba3c0af487e8040ab00842f9e928363cde (tree)
• Time: 2012-11-27 17:12:53
• Author: Muneyuki Noguchi <nogu.dev@gmai...>
• Commiter: Muneyuki Noguchi

Log Message

Replace toAscii() with toLatin1().

* qt4/immodule/qhelpermanager.cpp

- (QUimHelperManager::parseHelperStr):

Replace QString::toAscii() with QString::toLatin1()
because QString::toAscii() doesn't exist in Qt5 beta2.

* qt5/immodule/quimplatforminputcontext.cpp

- (QUimPlatformInputContext::filterEvent): Ditto.

Change Summary

• modified: qt4/immodule/qhelpermanager.cpp
• modified: qt5/immodule/quimplatforminputcontext.cpp

Incremental Difference

--- a/qt4/immodule/qhelpermanager.cpp
+++ b/qt4/immodule/qhelpermanager.cpp
@@ -132,9 +132,9 @@ void QUimHelperManager::parseHelperStr( const QString &str )
 
                     /* convert to unicode */
                     QTextCodec *codec
-                        = QTextCodec::codecForName( charset.toAscii() );
+                        = QTextCodec::codecForName( charset.toLatin1() );
                     if ( codec && !lines[ 2 ].isEmpty() )
-                        commit_str = codec->toUnicode( lines[ 2 ].toAscii() );
+                        commit_str = codec->toUnicode( lines[ 2 ].toLatin1() );
                 } else {
                     commit_str = lines[ 1 ];
                 }

--- a/qt5/immodule/quimplatforminputcontext.cpp
+++ b/qt5/immodule/quimplatforminputcontext.cpp
@@ -231,7 +231,7 @@ bool QUimPlatformInputContext::filterEvent(const QEvent *event)
 
     int key = 0;
     if (isascii(qkey) && isprint(qkey)) {
-        int ascii = keyevent->text()[0].toAscii();
+        int ascii = keyevent->text()[0].toLatin1();
         if (isalpha(ascii)) {
             key = ascii;  // uim needs lower/upper encoded key
         } else {