[uim] r7202 committed - * qt4/immodule/qhelpermanager.cpp...

[codesite-noreply]

Revision: 7202
Author:   nogu.dev
Date:     Sat Jul  9 19:19:23 2011
Log:      * qt4/immodule/qhelpermanager.cpp
  - (QUimHelperManager::parseHelperStr):
    Don't use QUimInputContext::readIMConf().
  - (QUimHelperManager::parseHelperStrImChange):
    Don't update style of candidate windows.
* qt4/immodule/quiminputcontext.cpp
  - (QUimInputContext::switch_app_global_im): Ditto.
  - (QUimInputContext::readIMConf): Remove.
* qt4/immodule/quiminputcontext.h
  - (QUimInputContext::readIMConf): Remove.
http://code.google.com/p/uim/source/detail?r=7202
Modified:
 /trunk/qt4/immodule/qhelpermanager.cpp
 /trunk/qt4/immodule/quiminputcontext.cpp
 /trunk/qt4/immodule/quiminputcontext.h

=======================================
--- /trunk/qt4/immodule/qhelpermanager.cpp      Sat Jul  9 00:47:37 2011
+++ /trunk/qt4/immodule/qhelpermanager.cpp      Sat Jul  9 19:19:23 2011
@@ -178,8 +178,10 @@
         infoManager->initUimInfo();

         QList<QUimInputContext *>::iterator it;
-        for ( it = contextList.begin(); it != contextList.end(); ++it )
-            ( *it )->readIMConf();
+        for ( it = contextList.begin(); it != contextList.end(); ++it ) {
+            ( *it )->updatePosition();
+            ( *it )->updateStyle();
+        }
     }
 }

@@ -196,7 +198,7 @@
             uim_switch_im( focusedInputContext->uimContext(),
                            im_name.toUtf8().data() );
             uim_prop_list_update( focusedInputContext->uimContext() );
-            focusedInputContext->readIMConf();
+            focusedInputContext->updatePosition();
         }
     }
     else if ( str.startsWith( QLatin1String( "im_change_whole_desktop" ) )  
)
@@ -205,7 +207,7 @@
         for ( it = contextList.begin(); it != contextList.end(); ++it )
         {
             uim_switch_im( ( *it )->uimContext(), im_name.toUtf8().data()  
);
-            ( *it )->readIMConf();
+            ( *it )->updatePosition();
             uim_prop_update_custom( ( *it )->uimContext(),
                                     "custom-preserved-default-im-name",
                                     im_name_sym.toUtf8().data() );
@@ -220,7 +222,7 @@
             for ( it = contextList.begin(); it != contextList.end(); ++it )
             {
                 uim_switch_im( ( *it )->uimContext(),  
im_name.toUtf8().data() );
-                ( *it )->readIMConf();
+                ( *it )->updatePosition();
                 uim_prop_update_custom( ( *it )->uimContext(),
                                         "custom-preserved-default-im-name",
                                         im_name_sym.toUtf8().data() );
=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp    Sat Jul  9 19:18:11 2011
+++ /trunk/qt4/immodule/quiminputcontext.cpp    Sat Jul  9 19:19:23 2011
@@ -906,7 +906,7 @@
     {
         if ( ( *it ) != this) {
             uim_switch_im( ( *it )->uimContext(), name );
-            ( *it )->readIMConf();
+            ( *it )->updatePosition();
         }
     }
      
uim_prop_update_custom(this->uimContext(), "custom-preserved-default-im-name",  
im_name_sym.toUtf8().data() );
@@ -946,12 +946,6 @@
     }
 #endif
 }
-
-void QUimInputContext::readIMConf()
-{
-    updatePosition();
-    updateStyle();
-}

 void QUimInputContext::updateIndicator( const QString &str )
 {
=======================================
--- /trunk/qt4/immodule/quiminputcontext.h      Sat Jul  9 19:18:11 2011
+++ /trunk/qt4/immodule/quiminputcontext.h      Sat Jul  9 19:19:23 2011
@@ -97,7 +97,6 @@

     void updatePosition();
     void updateStyle();
-    void readIMConf();

     QUimTextUtil *textUtil() { return mTextUtil; }