Revision: 6420
Author: nogu.dev
Date: Sat Jun 5 16:15:18 2010
Log: * qt4/immodule/quiminputcontext.cpp
- (QUimInputContext::QUimInputContext): Remove m_imname.
- (QUimInputContext::createUimContext): Ditto.
- (QUimInputContext::savePreedit):
Use uim_get_current_im_name() instead of m_imname
because m_imname is always the same value.
* qt4/immodule/quiminputcontext.h
- (QUimInputContext): Remove m_imname.
http://code.google.com/p/uim/source/detail?r=6420
Modified:
/trunk/qt4/immodule/quiminputcontext.cpp
/trunk/qt4/immodule/quiminputcontext.h
=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp Sat Jun 5 16:15:09 2010
+++ /trunk/qt4/immodule/quiminputcontext.cpp Sat Jun 5 16:15:18 2010
@@ -79,8 +79,7 @@
// suggest the change in future. -- YamaKen 2004-07-28
QUimInputContext::QUimInputContext( const char *imname )
- : QInputContext(), m_imname( imname ),
- candwinIsActive( false ), m_isComposing( false ), m_uc( 0 )
+ : candwinIsActive( false ), m_isComposing( false ), m_uc( 0 )
#ifdef WORKAROUND_BROKEN_RESET_IN_QT4
, focusedWidget( 0 )
#endif
@@ -147,8 +146,6 @@
uim_context QUimInputContext::createUimContext( const char *imname )
{
- m_imname = imname;
-
uim_context uc = uim_create_context( this, "UTF-8",
0, imname,
0,
@@ -657,8 +654,9 @@
visibleHash.insert( focusedWidget, cwin->isVisible() );
cwin->hide();
- if ( !m_imname.isEmpty() )
- m_uc = createUimContext( m_imname.toAscii().data() );
+ const char *imname = uim_get_current_im_name( m_uc );
+ if ( imname )
+ m_uc = createUimContext( imname );
psegs.clear();
cwin = new CandidateWindow( 0 );
cwin->setQUimInputContext( this );
=======================================
--- /trunk/qt4/immodule/quiminputcontext.h Sat Jun 5 16:15:09 2010
+++ /trunk/qt4/immodule/quiminputcontext.h Sat Jun 5 16:15:18 2010
@@ -165,7 +165,6 @@
CaretStateIndicator *m_indicator;
protected:
- QString m_imname;
bool candwinIsActive;
bool m_isComposing;
