[uim] r6243 committed - * qt4/immodule/qtextutil.cpp...

[codesite-noreply]

Revision: 6243
Author: nogu.dev
Date: Thu Mar 11 04:29:19 2010
Log: * qt4/immodule/qtextutil.cpp
  - (QUimTextUtil::acquirePrimaryText, QUimTextUtil::acquireSelectionText,
     QUimTextUtil::deletePrimaryText, QUimTextUtil::deleteSelectionText):
    Replace QInputContext::focusWidget() with QApplication::focusWidget().
    There is no description of QInputContext::focusWidget() in the Qt 4.5
    documentation. We shouldn't call undocumented functions.
* qt4/immodule/quiminputcontext.cpp
  - (QUimInputContext::setFocus, QUimInputContext::unsetFocus,
     QUimInputContext::update): Ditto.
* qt4/immodule/quiminputcontext_with_slave.cpp
  - (QUimInputContextWithSlave::setFocus,
     QUimInputContextWithSlave::destroyInputContext): Ditto.
http://code.google.com/p/uim/source/detail?r=6243
Modified:
 /trunk/qt4/immodule/qtextutil.cpp
 /trunk/qt4/immodule/quiminputcontext.cpp
 /trunk/qt4/immodule/quiminputcontext_with_slave.cpp

=======================================
--- /trunk/qt4/immodule/qtextutil.cpp   Sun Feb 28 15:01:04 2010
+++ /trunk/qt4/immodule/qtextutil.cpp   Thu Mar 11 04:29:19 2010
@@ -120,7 +120,7 @@
 {
     int err;
 #if defined(Q_WS_X11)
-    mWidget = mIc->focusWidget();
+    mWidget = QApplication::focusWidget();
 #else
     return -1;
 #endif
@@ -412,7 +412,7 @@
 {
     int err;
 #if defined(Q_WS_X11)
-    mWidget = mIc->focusWidget();
+    mWidget = QApplication::focusWidget();
 #else
     return -1;
 #endif
@@ -625,7 +625,7 @@
 {
     int err;
 #if defined(Q_WS_X11)
-    mWidget = mIc->focusWidget();
+    mWidget = QApplication::focusWidget();
 #else
     return -1;
 #endif
@@ -842,7 +842,7 @@
 {
     int err;
 #if defined(Q_WS_X11)
-    mWidget = mIc->focusWidget();
+    mWidget = QApplication::focusWidget();
 #else
     return -1;
 #endif
=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp    Tue Mar  2 14:25:16 2010
+++ /trunk/qt4/immodule/quiminputcontext.cpp    Thu Mar 11 04:29:19 2010
@@ -37,6 +37,7 @@
 #include <cstring>

 #include <QtCore/QPoint>
+#include <QtGui/QApplication>
 #include <QtGui/QInputMethodEvent>
 #include <QtGui/QLabel>
 #include <QtGui/QTextCharFormat>
@@ -357,7 +358,7 @@
 void QUimInputContext::setFocus()
 {
     qDebug( "QUimInputContext: %p->setFocus(), focusWidget()=%p",
-            this, focusWidget() );
+            this, QApplication::focusWidget() );

     focusedInputContext = this;
     disableFocusedContext = false;
@@ -377,7 +378,7 @@
 void QUimInputContext::unsetFocus()
 {
     qDebug( "QUimInputContext: %p->unsetFocus(), focusWidget()=%p",
-            this, focusWidget() );
+            this, QApplication::focusWidget() );

     uim_focus_out_context( m_uc );

@@ -462,7 +463,7 @@

 void QUimInputContext::update()
 {
-    QWidget *w = focusWidget();
+    QWidget *w = QApplication::focusWidget();

     qDebug( "QUimInputContext::update() w = %p", w );

=======================================
--- /trunk/qt4/immodule/quiminputcontext_with_slave.cpp	Sun Feb 28 15:00:02  
2010
+++ /trunk/qt4/immodule/quiminputcontext_with_slave.cpp	Thu Mar 11 04:29:19  
2010
@@ -63,7 +63,7 @@
     if ( slave )
     {
         slave->setFocus();
-        slave->setFocusWidget( focusWidget() );
+        slave->setFocusWidget( QApplication::focusWidget() );
     }
 }

@@ -109,9 +109,9 @@
     {
         // slave->reset() may not properly work in the case, so we
         // manually resets the composing state of text widget
-        if ( slave->focusWidget() )
-        {
-            //            emit imEventGenerated( slave->focusWidget(), new  
QIMEvent( QEvent::IMEnd, QString::null, -1 ) );
+        if ( QApplication::focusWidget() )
+        {
+            //            emit imEventGenerated(  
QApplication::focusWidget(), new QIMEvent( QEvent::IMEnd, QString::null, -1  
) );
         }
         slave->deleteLater();
         slave = 0;