Revision: 6291
Author: nogu.dev
Date: Thu Mar 25 03:21:05 2010
Log: * qt4/immodule/quiminputcontext.cpp
- (QUimInputContext::x11FilterEvent): Use Q_UNUSED macro for `event'
only if UIM_QT_USE_JAPANESE_KANA_KEYBOARD_HACK isn't defined.
The `event' parameter is used when
UIM_QT_USE_JAPANESE_KANA_KEYBOARD_HACK
is defined.
* qt4/immodule/quiminputcontext.h
- Use Q_WS_X11 macro after Qt4 header file is included.
The macro is defined in a Qt4 header file.
http://code.google.com/p/uim/source/detail?r=6291
Modified:
/trunk/qt4/immodule/quiminputcontext.cpp
/trunk/qt4/immodule/quiminputcontext.h
=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp Wed Mar 24 15:04:47 2010
+++ /trunk/qt4/immodule/quiminputcontext.cpp Thu Mar 25 03:21:05 2010
@@ -179,11 +179,11 @@
bool QUimInputContext::x11FilterEvent( QWidget *keywidget, XEvent *event )
{
Q_UNUSED( keywidget )
- Q_UNUSED( event )
#if UIM_QT_USE_JAPANESE_KANA_KEYBOARD_HACK
return uim_x_kana_input_hack_filter_event( m_uc, event );
#else
+ Q_UNUSED( event )
return false;
#endif
}
=======================================
--- /trunk/qt4/immodule/quiminputcontext.h Wed Mar 24 15:04:47 2010
+++ /trunk/qt4/immodule/quiminputcontext.h Thu Mar 25 03:21:05 2010
@@ -35,12 +35,12 @@
#ifndef UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_H
#define UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_H
+#include <QtGui/QInputContext>
+
#ifdef Q_WS_X11
#define UIM_QT_USE_JAPANESE_KANA_KEYBOARD_HACK 1
#endif
-#include <QtGui/QInputContext>
-
#include <uim/uim.h>
#include <uim/uim-helper.h>
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.
