[uim] r6316 committed - * qt4/immodule/caretstateindicator.cpp...

[codesite-noreply]

Revision: 6316
Author: nogu.dev
Date: Fri Apr  9 19:44:57 2010
Log: * qt4/immodule/caretstateindicator.cpp
  - (CaretStateIndicator::setup): Rename to update().
* qt4/immodule/caretstateindicator.h
  - Ditto.
* qt4/immodule/qhelpermanager.cpp
  - (QUimHelperManager::update_prop_list_cb):
    Use QUimInputContext::updateIndicator().
* qt4/immodule/quiminputcontext.cpp
  - (QUimInputContext::setupIndicator): Rename to updateIndicator().
* qt4/immodule/quiminputcontext.h
  - Ditto.
http://code.google.com/p/uim/source/detail?r=6316
Modified:
 /trunk/qt4/immodule/caretstateindicator.cpp
 /trunk/qt4/immodule/caretstateindicator.h
 /trunk/qt4/immodule/qhelpermanager.cpp
 /trunk/qt4/immodule/quiminputcontext.cpp
 /trunk/qt4/immodule/quiminputcontext.h

=======================================
--- /trunk/qt4/immodule/caretstateindicator.cpp Fri Apr  9 19:44:46 2010
+++ /trunk/qt4/immodule/caretstateindicator.cpp Fri Apr  9 19:44:57 2010
@@ -65,7 +65,7 @@
         delete m_labelList.takeFirst();
 }

-void CaretStateIndicator::setup(const QString &str)
+void CaretStateIndicator::update(const QString &str)
 {
     bool isEnabled = uim_scm_symbol_value_bool("bridge-show-input-state?");
     char *type =  
uim_scm_c_symbol(uim_scm_symbol_value("bridge-show-with?"));
=======================================
--- /trunk/qt4/immodule/caretstateindicator.h   Fri Apr  9 19:44:46 2010
+++ /trunk/qt4/immodule/caretstateindicator.h   Fri Apr  9 19:44:57 2010
@@ -44,7 +44,7 @@
         explicit CaretStateIndicator(QWidget *parent = 0);
         ~CaretStateIndicator();

-        void setup(const QString &str);
+        void update(const QString &str);

         // space between this indicator and a caret
         static const int SPACING;
=======================================
--- /trunk/qt4/immodule/qhelpermanager.cpp      Sun Apr  4 20:35:54 2010
+++ /trunk/qt4/immodule/qhelpermanager.cpp      Fri Apr  9 19:44:57 2010
@@ -281,7 +281,7 @@

     uim_helper_send_message( im_uim_fd, msg.toUtf8().data() );

-    ic->setupIndicator( msg );
+    ic->updateIndicator( msg );
 }

 void QUimHelperManager::update_prop_label_cb( void *ptr, const char *str )
=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp    Sun Apr  4 20:35:54 2010
+++ /trunk/qt4/immodule/quiminputcontext.cpp    Fri Apr  9 19:44:57 2010
@@ -861,9 +861,9 @@
     free( leftp );
 }

-void QUimInputContext::setupIndicator( const QString &str )
-{
-    m_indicator->setup( str );
+void QUimInputContext::updateIndicator( const QString &str )
+{
+    m_indicator->update( str );
 }

 static int unicodeToUKey (ushort c) {
=======================================
--- /trunk/qt4/immodule/quiminputcontext.h      Sun Apr  4 20:35:54 2010
+++ /trunk/qt4/immodule/quiminputcontext.h      Fri Apr  9 19:44:57 2010
@@ -105,7 +105,7 @@
     void saveContext();
     void restoreContext();

-    void setupIndicator( const QString &str );
+    void updateIndicator( const QString &str );

 protected:
     uim_context createUimContext( const char *imname );


--
To unsubscribe, reply using "remove me" as the subject.