Author: yamakenz
Date: Thu Sep 20 02:01:43 2007
New Revision: 4984
Modified:
trunk/qt/quiminputcontextplugin-qt4/plugin.cpp
trunk/qt/quiminputcontextplugin-qt4/qhelpermanager.cpp
trunk/qt/quiminputcontextplugin-qt4/quiminputcontext.cpp
Log:
* qt/quiminputcontextplugin-qt4/plugin.cpp
- (UimInputContextPlugin::create,
UimInputContextPlugin::createImList): Follow the removal of
QString::operator const char *() in Qt4
* qt/quiminputcontextplugin-qt4/quiminputcontext.cpp
- (QUimInputContext::filterEvent, QUimInputContext::commit_cb,
QUimInputContext::pushback_cb): Ditto
* qt/quiminputcontextplugin-qt4/qhelpermanager.cpp
- (QUimHelperManager::parseHelperStr,
QUimHelperManager::parseHelperStrImChange,
QUimHelperManager::sendImList,
QUimHelperManager::update_prop_list_cb,
QUimHelperManager::update_prop_label_cb): Ditto
Modified: trunk/qt/quiminputcontextplugin-qt4/plugin.cpp
==============================================================================
--- trunk/qt/quiminputcontextplugin-qt4/plugin.cpp (original)
+++ trunk/qt/quiminputcontextplugin-qt4/plugin.cpp Thu Sep 20 02:01:43 2007
@@ -34,7 +34,8 @@
imname = key.mid( 4 );
QStringList langs = createLanguageList( key );
- QUimInputContext *uic = new QUimInputContext( imname, langs[ 0 ] );
+ QUimInputContext *uic = new QUimInputContext( imname.toUtf8(),
+ langs[ 0 ].toUtf8() );
return uic;
}
@@ -90,7 +91,7 @@
qs = "uim-" + qs;
lst << qs;
- qDebug( "name = %s", ( const char* ) qs );
+ qDebug( "name = %s", ( const char* ) qs.toUtf8() );
}
}
uim_release_context( tmp_uc );
Modified: trunk/qt/quiminputcontextplugin-qt4/qhelpermanager.cpp
==============================================================================
--- trunk/qt/quiminputcontextplugin-qt4/qhelpermanager.cpp (original)
+++ trunk/qt/quiminputcontextplugin-qt4/qhelpermanager.cpp Thu Sep 20
02:01:43 2007
@@ -77,7 +77,8 @@
else if ( str.startsWith( "prop_activate" ) )
{
QStringList list = str.split( "\n" );
- uim_prop_activate( focusedInputContext->uimContext(), ( const
char* ) list[ 1 ] );
+ uim_prop_activate( focusedInputContext->uimContext(),
+ list[ 1 ].toUtf8() );
}
else if ( str.startsWith( "im_list_get" ) )
{
@@ -108,7 +109,9 @@
{
for ( int i = 0; i < contextList.size(); ++i )
{
- uim_prop_update_custom( contextList.at( i ) ->uimContext(),
list[ 1 ], list[ 2 ] );
+ uim_prop_update_custom( contextList.at( i ) ->uimContext(),
+ list[ 1 ].toUtf8(),
+ list[ 2 ].toUtf8() );
break; /* all custom variables are global */
}
}
@@ -125,7 +128,8 @@
{
if ( focusedInputContext )
{
- uim_switch_im( focusedInputContext->uimContext(), ( const char* )
im_name );
+ uim_switch_im( focusedInputContext->uimContext(),
+ im_name.toUtf8() );
uim_prop_list_update( focusedInputContext->uimContext() );
focusedInputContext->readIMConf();
}
@@ -135,7 +139,7 @@
for ( int i = 0; i < contextList.size(); ++i )
{
QUimInputContext *uic = contextList.at( i );
- uim_switch_im( uic->uimContext(), ( const char* ) im_name );
+ uim_switch_im( uic->uimContext(), im_name.toUtf8() );
uic->readIMConf();
}
@@ -147,7 +151,7 @@
for ( int i = 0; i < contextList.size(); ++i )
{
QUimInputContext *uic = contextList.at( i );
- uim_switch_im( uic->uimContext(), ( const char* ) im_name );
+ uim_switch_im( uic->uimContext(), im_name.toUtf8() );
uic->readIMConf();
}
}
@@ -179,7 +183,7 @@
msg += leafstr;
}
- uim_helper_send_message( im_uim_fd, ( const char* ) msg.utf8() );
+ uim_helper_send_message( im_uim_fd, ( const char* ) msg.toUtf8() );
}
void QUimHelperManager::helper_disconnect_cb()
@@ -202,7 +206,7 @@
QString msg = "prop_list_update\ncharset=UTF-8\n";
msg += QString::fromUtf8( str );
- uim_helper_send_message( im_uim_fd, ( const char* ) msg.utf8() );
+ uim_helper_send_message( im_uim_fd, ( const char* ) msg.toUtf8() );
}
void QUimHelperManager::update_prop_label_cb( void *ptr, const char *str )
@@ -214,5 +218,5 @@
QString msg = "prop_label_update\ncharset=UTF-8\n";
msg += QString::fromUtf8( str );
- uim_helper_send_message( im_uim_fd, ( const char* ) msg.utf8() );
+ uim_helper_send_message( im_uim_fd, ( const char* ) msg.toUtf8() );
}
Modified: trunk/qt/quiminputcontextplugin-qt4/quiminputcontext.cpp
==============================================================================
--- trunk/qt/quiminputcontextplugin-qt4/quiminputcontext.cpp (original)
+++ trunk/qt/quiminputcontextplugin-qt4/quiminputcontext.cpp Thu Sep 20
02:01:43 2007
@@ -135,7 +135,7 @@
int key = 0;
if ( isascii( qkey ) && isprint( qkey ) )
{
- int ascii = keyevent->text() [ 0 ].ascii();
+ int ascii = keyevent->text()[ 0 ].toAscii();
if ( isalpha( ascii ) )
{
key = ascii; // uim needs lower/upper encoded key
@@ -315,7 +315,7 @@
void QUimInputContext::commit_cb( void *ptr, const char *str )
{
QString qs = QString::fromUtf8( str );
- qDebug( "commit_cb : str = |%s|", ( const char* ) qs.local8Bit() );
+ qDebug( "commit_cb : str = |%s|", ( const char* ) qs.toLocal8Bit() );
QUimInputContext *ic = ( QUimInputContext * ) ptr;
ic->commitString( qs );
@@ -332,7 +332,7 @@
void QUimInputContext::pushback_cb( void *ptr, int attr, const char *str )
{
QString qs = QString::fromUtf8( str );
- qDebug( "pushback_cb : str = |%s|", ( const char* ) qs.local8Bit() );
+ qDebug( "pushback_cb : str = |%s|", ( const char* ) qs.toLocal8Bit() );
if ( !str )
return ;
