[uim] r6278 committed - * qt4/immodule/quiminputcontext.cpp...

[codesite-noreply]

Revision: 6278
Author: nogu.dev
Date: Wed Mar 24 15:04:47 2010
Log: * qt4/immodule/quiminputcontext.cpp
  - (QUimInputContext::candidateActivate,
     QUimInputContext::candidateSelect,
     QUimInputContext::candidateShiftPage,
     QUimInputContext::candidateDeactivate): Remove.
  - (QUimInputContext::cand_activate_cb,
     QUimInputContext::cand_select_cb,
     QUimInputContext::cand_shift_page_cb,
     QUimInputContext::cand_deactivate_cb):
    Call CandidateWindow's member functions directly.
* qt4/immodule/quiminputcontext.h
  - Remove CandidateWindow-related functions.
http://code.google.com/p/uim/source/detail?r=6278
Modified:
 /trunk/qt4/immodule/quiminputcontext.cpp
 /trunk/qt4/immodule/quiminputcontext.h

=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp    Wed Mar 24 15:04:35 2010
+++ /trunk/qt4/immodule/quiminputcontext.cpp    Wed Mar 24 15:04:47 2010
@@ -564,7 +564,8 @@
 #endif

     QUimInputContext *ic = static_cast<QUimInputContext*>( ptr );
-    ic->candidateActivate( nr, displayLimit );
+    ic->cwin->candidateActivate( nr, displayLimit );
+    ic->candwinIsActive = true;
 }

 void QUimInputContext::cand_select_cb( void *ptr, int index )
@@ -574,7 +575,7 @@
 #endif

     QUimInputContext *ic = static_cast<QUimInputContext*>( ptr );
-    ic->candidateSelect( index );
+    ic->cwin->candidateSelect( index );
 }

 void QUimInputContext::cand_shift_page_cb( void *ptr, int forward )
@@ -584,7 +585,7 @@
 #endif

     QUimInputContext *ic = static_cast<QUimInputContext*>( ptr );
-    ic->candidateShiftPage( forward != 0 );
+    ic->cwin->candidateShiftPage( forward );
 }

 void QUimInputContext::cand_deactivate_cb( void *ptr )
@@ -594,7 +595,8 @@
 #endif

     QUimInputContext *ic = static_cast<QUimInputContext*>( ptr );
-    ic->candidateDeactivate();
+    ic->cwin->deactivateCandwin();
+    ic->candwinIsActive = false;
 }

 void QUimInputContext::switch_app_global_im_cb( void *ptr, const char  
*name )
@@ -829,29 +831,6 @@

     return attrs;
 }
-
-void QUimInputContext::candidateActivate( int nr, int displayLimit )
-{
-    cwin->candidateActivate( nr, displayLimit );
-    candwinIsActive = true;
-}
-
-void QUimInputContext::candidateSelect( int index )
-{
-    cwin->candidateSelect( index );
-}
-
-void QUimInputContext::candidateShiftPage( bool forward )
-{
-    cwin->candidateShiftPage( forward );
-}
-
-
-void QUimInputContext::candidateDeactivate()
-{
-    cwin->deactivateCandwin();
-    candwinIsActive = false;
-}

 void QUimInputContext::switch_app_global_im( const char *name )
 {
=======================================
--- /trunk/qt4/immodule/quiminputcontext.h      Wed Mar 24 15:04:35 2010
+++ /trunk/qt4/immodule/quiminputcontext.h      Wed Mar 24 15:04:47 2010
@@ -137,11 +137,6 @@
     void clearPreedit();
     void pushbackPreeditString( int attr, const QString& str );
     void updatePreedit();
-    //candidate
-    void candidateActivate( int nr, int displayLimit );
-    void candidateSelect( int index );
-    void candidateShiftPage( bool forward );
-    void candidateDeactivate();
     //imsw
     void switch_app_global_im( const char *str );
     void switch_system_global_im( const char *str );

To unsubscribe from this group, send email to uim-commit+unsubscribegooglegroups.com or 
reply to this email with the words "REMOVE ME" as the subject.