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

[codesite-noreply]

Revision: 6184
Author: nogu.dev
Date: Sun Feb 28 14:55:51 2010
Log: * qt4/immodule/quiminputcontext.cpp
  - (QUimInputContext::x11FilterEvent, QUimInputContext::filterEvent,
    QUimInputContext::reset, QUimInputContext::getPreeditAttrs):
    Don't use obsolete TRUE/FALSE macros.
* qt4/immodule/subwindow.cpp
  - (SubWindow::hookPopup): Ditto.
http://code.google.com/p/uim/source/detail?r=6184
Modified:
 /trunk/qt4/immodule/quiminputcontext.cpp
 /trunk/qt4/immodule/subwindow.cpp

=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp    Sun Feb 28 14:55:40 2010
+++ /trunk/qt4/immodule/quiminputcontext.cpp    Sun Feb 28 14:55:51 2010
@@ -187,7 +187,7 @@
 #if UIM_QT_USE_JAPANESE_KANA_KEYBOARD_HACK
     return uim_x_kana_input_hack_filter_event( m_uc, event );
 #else
-    return FALSE;
+    return false;
 #endif
 }
 #endif // Q_WS_X11
@@ -200,7 +200,7 @@

     if ( type != QEvent::KeyPress &&
             type != QEvent::KeyRelease )
-        return FALSE;
+        return false;

     QKeyEvent *keyevent = ( QKeyEvent * ) event;
     int qkey = keyevent->key();
@@ -329,7 +329,7 @@
             return mCompose->handle_qkey( keyevent );
 #else
         if ( notFiltered )
-            return FALSE;
+            return false;
 #endif
     }
     else if ( type == QEvent::KeyRelease )
@@ -340,11 +340,11 @@
             return mCompose->handle_qkey( keyevent );
 #else
         if ( notFiltered )
-            return FALSE;
+            return false;
 #endif
     }

-    return TRUE;
+    return true;
 }

 void QUimInputContext::setFocusWidget( QWidget *w )
@@ -456,7 +456,7 @@
 {
     qDebug( "QUimInputContext::reset()" );

-    candwinIsActive = FALSE;
+    candwinIsActive = false;
     cwin->hide();
     uim_reset_context( m_uc );
 #ifdef Q_WS_X11
@@ -764,7 +764,7 @@
 #endif
             }
             if ( uimAttr & UPreeditAttr_UnderLine ) {
-                segFmt.setFontUnderline( TRUE );
+                segFmt.setFontUnderline( true );
             }
             QInputMethodEvent::Attribute segAttr(  
QInputMethodEvent::TextFormat,
                                                   segPos, segStrLen,  
segFmt );
=======================================
--- /trunk/qt4/immodule/subwindow.cpp   Tue Jan 20 18:11:15 2009
+++ /trunk/qt4/immodule/subwindow.cpp   Sun Feb 28 14:55:51 2010
@@ -82,7 +82,7 @@
     m_titleLabel->setText( title );
     m_contentsEdit->setText( contents );

-    m_hookTimer->start( TIMER_INTERVAL, TRUE );
+    m_hookTimer->start( TIMER_INTERVAL, true );
 }

 void SubWindow::popup()