0011-don-t-include-headers-in-the-Qt3-style.patch

Subject: [PATCH 11/26] don't include headers in the Qt3 style

---
 qt4/candwin/qt4.cpp                          |   18 +++++++++---------
 qt4/candwin/qt4.h                            |    6 +++---
 qt4/edittest/main.cpp                        |   12 ++++++------
 qt4/immodule/candidatewindow.cpp             |   12 ++++++------
 qt4/immodule/candidatewindow.h               |   10 +++++-----
 qt4/immodule/debug.h                         |    2 +-
 qt4/immodule/plugin.cpp                      |   10 +++++-----
 qt4/immodule/plugin.h                        |    4 ++--
 qt4/immodule/qhelpermanager.cpp              |   10 +++++-----
 qt4/immodule/qhelpermanager.h                |    2 +-
 qt4/immodule/qtextutil.cpp                   |   11 +++++------
 qt4/immodule/qtextutil.h                     |    2 +-
 qt4/immodule/quiminfomanager.cpp             |    2 +-
 qt4/immodule/quiminfomanager.h               |    2 +-
 qt4/immodule/quiminputcontext.cpp            |   16 +++++++---------
 qt4/immodule/quiminputcontext.h              |    4 ++--
 qt4/immodule/quiminputcontext_compose.cpp    |    2 +-
 qt4/immodule/quiminputcontext_with_slave.cpp |    2 +-
 qt4/immodule/subwindow.cpp                   |   14 +++++++-------
 qt4/immodule/subwindow.h                     |    4 ++--
 20 files changed, 71 insertions(+), 74 deletions(-)

diff --git a/qt4/candwin/qt4.cpp b/qt4/candwin/qt4.cpp
index 730b7f5..ea9efeb 100644
--- a/qt4/candwin/qt4.cpp
+++ b/qt4/candwin/qt4.cpp
@@ -34,15 +34,15 @@
 
 #include <config.h>
 
-#include <qapplication.h>
-#include <QDesktopWidget>
-#include <qlabel.h>
-#include <qwidget.h>
-#include <Q3Header>
-#include <qsocketnotifier.h>
-#include <qstringlist.h>
-#include <qtextcodec.h>
-#include <qrect.h>
+#include <QtCore/QRect>
+#include <QtCore/QSocketNotifier>
+#include <QtCore/QStringList>
+#include <QtCore/QTextCodec>
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopWidget>
+#include <QtGui/QLabel>
+#include <QtGui/QWidget>
+#include <Qt3Support/Q3Header>
 
 #include <locale.h>
 #include <stdio.h>
diff --git a/qt4/candwin/qt4.h b/qt4/candwin/qt4.h
index 6bb5232..b0a624e 100644
--- a/qt4/candwin/qt4.h
+++ b/qt4/candwin/qt4.h
@@ -36,9 +36,9 @@
 #include <uim/uim.h>
 #include <uim/uim-helper.h>
 
-#include <Q3VBox>
-#include <Q3ListView>
-#include <Q3ValueList>
+#include <Qt3Support/Q3ListView>
+#include <Qt3Support/Q3VBox>
+#include <Qt3Support/Q3ValueList>
 
 class QLabel;
 class CandidateListView;
diff --git a/qt4/edittest/main.cpp b/qt4/edittest/main.cpp
index 09dfbd8..b422277 100644
--- a/qt4/edittest/main.cpp
+++ b/qt4/edittest/main.cpp
@@ -32,12 +32,12 @@
 
 */
 
-#include <qapplication.h>
-#include <qlineedit.h>
-#include <qtextedit.h>
-#include <qsplitter.h>
-#include <Q3VBox>
-#include <qlabel.h>
+#include <QtGui/QApplication>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QSplitter>
+#include <QtGui/QTextEdit>
+#include <Qt3Support/Q3VBox>
 
 int main(int argc, char *argv[])
 {
diff --git a/qt4/immodule/candidatewindow.cpp b/qt4/immodule/candidatewindow.cpp
index ead9b14..b6fc677 100644
--- a/qt4/immodule/candidatewindow.cpp
+++ b/qt4/immodule/candidatewindow.cpp
@@ -34,12 +34,12 @@ SUCH DAMAGE.
 
 //#include <config.h>
 
-#include <qapplication.h>
-#include <QDesktopWidget>
-#include <qlabel.h>
-#include <Q3Header>
-#include <qfontmetrics.h>
-#include <qevent.h>
+#include <QtCore/QEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopWidget>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QLabel>
+#include <Qt3Support/Q3Header>
 
 #include "uim/uim.h"
 
diff --git a/qt4/immodule/candidatewindow.h b/qt4/immodule/candidatewindow.h
index c7a54c6..9281aeb 100644
--- a/qt4/immodule/candidatewindow.h
+++ b/qt4/immodule/candidatewindow.h
@@ -35,11 +35,11 @@ SUCH DAMAGE.
 
 #include <uim/uim.h>
 
-#include <Q3VBox>
-#include <Q3ListView>
-#include <Q3ValueList>
-#include <qevent.h>
-#include <qfontmetrics.h>
+#include <QtCore/QEvent>
+#include <QtGui/QFontMetrics>
+#include <Qt3Support/Q3VBox>
+#include <Qt3Support/Q3ListView>
+#include <Qt3Support/Q3ValueList>
 
 class QLabel;
 
diff --git a/qt4/immodule/debug.h b/qt4/immodule/debug.h
index 1341aab..2f42313 100644
--- a/qt4/immodule/debug.h
+++ b/qt4/immodule/debug.h
@@ -34,7 +34,7 @@ SUCH DAMAGE.
 #ifndef UIM_QT4_IMMODULE_DEBUG_H
 #define UIM_QT4_IMMODULE_DEBUG_H
 
-#include <QtGlobal>
+#include <QtCore/QtGlobal>
 
 #ifdef QT_NO_DEBUG
 #undef qDebug
diff --git a/qt4/immodule/plugin.cpp b/qt4/immodule/plugin.cpp
index 9f94b44..5811737 100644
--- a/qt4/immodule/plugin.cpp
+++ b/qt4/immodule/plugin.cpp
@@ -34,12 +34,12 @@
 
 #include "plugin.h"
 
-#include <qapplication.h>
-#include <qinputcontextplugin.h>
-#include <qinputcontext.h>
-#include <qstringlist.h>
+#include <QtCore/QStringList>
+#include <QtGui/QApplication>
+#include <QtGui/QInputContext>
+#include <QtGui/QInputContextPlugin>
 #ifdef Q_WS_X11
-#include <QX11Info>
+#include <QtGui/QX11Info>
 #endif
 
 #include "uim/uim.h"
diff --git a/qt4/immodule/plugin.h b/qt4/immodule/plugin.h
index 9fb51c7..9d6db2d 100644
--- a/qt4/immodule/plugin.h
+++ b/qt4/immodule/plugin.h
@@ -34,8 +34,8 @@
 #ifndef UIM_QT4_IMMODULE_PLUGIN_H
 #define UIM_QT4_IMMODULE_PLUGIN_H
 
-#include <qinputcontextplugin.h>
-#include <qstringlist.h>
+#include <QtCore/QStringList>
+#include <QtGui/QInputContextPlugin>
 
 class QUimInfoManager;
 
diff --git a/qt4/immodule/qhelpermanager.cpp b/qt4/immodule/qhelpermanager.cpp
index b59f1c0..930540f 100644
--- a/qt4/immodule/qhelpermanager.cpp
+++ b/qt4/immodule/qhelpermanager.cpp
@@ -34,11 +34,11 @@ SUCH DAMAGE.
 
 //#include <config.h>
 
-#include <qsocketnotifier.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <Q3PtrList>
-#include <qtextcodec.h>
+#include <QtCore/QSocketNotifier>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QTextCodec>
+#include <Qt3Support/Q3PtrList>
 
 #include "uim/uim.h"
 #include "uim/uim-util.h"
diff --git a/qt4/immodule/qhelpermanager.h b/qt4/immodule/qhelpermanager.h
index cf92670..c1e7481 100644
--- a/qt4/immodule/qhelpermanager.h
+++ b/qt4/immodule/qhelpermanager.h
@@ -33,7 +33,7 @@ SUCH DAMAGE.
 #ifndef UIM_QT4_IMMODULE_QHELPERMANAGER_H
 #define UIM_QT4_IMMODULE_QHELPERMANAGER_H
 
-#include <qobject.h>
+#include <QtCore/QObject>
 
 class QString;
 class QSocketNotifier;
diff --git a/qt4/immodule/qtextutil.cpp b/qt4/immodule/qtextutil.cpp
index 0d2a948..295bf9b 100644
--- a/qt4/immodule/qtextutil.cpp
+++ b/qt4/immodule/qtextutil.cpp
@@ -38,12 +38,11 @@ SUCH DAMAGE.
 
 #include <stdlib.h>
 
-#include <qwidget.h>
-#include <qlineedit.h>
-//#include <qtextedit.h>
-#include <Q3TextEdit>
-#include <qapplication.h>
-#include <qclipboard.h>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtGui/QLineEdit>
+#include <QtGui/QWidget>
+#include <Qt3Support/Q3TextEdit>
 
 #include "uim/uim.h"
 
diff --git a/qt4/immodule/qtextutil.h b/qt4/immodule/qtextutil.h
index eb6d801..0fe8355 100644
--- a/qt4/immodule/qtextutil.h
+++ b/qt4/immodule/qtextutil.h
@@ -33,7 +33,7 @@ SUCH DAMAGE.
 #ifndef UIM_QT4_IMMODULE_QTEXTUTIL_H
 #define UIM_QT4_IMMODULE_QTEXTUTIL_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "uim/uim.h"
 
diff --git a/qt4/immodule/quiminfomanager.cpp b/qt4/immodule/quiminfomanager.cpp
index 8d1419d..7246fb0 100644
--- a/qt4/immodule/quiminfomanager.cpp
+++ b/qt4/immodule/quiminfomanager.cpp
@@ -34,7 +34,7 @@ SUCH DAMAGE.
 
 //#include <config.h>
 
-#include <Q3ValueList>
+#include <Qt3Support/Q3ValueList>
 
 #include "uim/uim.h"
 
diff --git a/qt4/immodule/quiminfomanager.h b/qt4/immodule/quiminfomanager.h
index f4c55e7..0f0e0d8 100644
--- a/qt4/immodule/quiminfomanager.h
+++ b/qt4/immodule/quiminfomanager.h
@@ -33,7 +33,7 @@ SUCH DAMAGE.
 #ifndef UIM_QT4_IMMODULE_QUIMINFOMANAGER_H
 #define UIM_QT4_IMMODULE_QUIMINFOMANAGER_H
 
-#include <Q3ValueList>
+#include <Qt3Support/Q3ValueList>
 
 struct uimInfo
 {
diff --git a/qt4/immodule/quiminputcontext.cpp b/qt4/immodule/quiminputcontext.cpp
index 6bb3c3d..b108a22 100644
--- a/qt4/immodule/quiminputcontext.cpp
+++ b/qt4/immodule/quiminputcontext.cpp
@@ -33,15 +33,13 @@
 */
 #include "quiminputcontext.h"
 
-#include <qnamespace.h>
-#include <qevent.h>
-#include <qglobal.h>
-#include <qapplication.h>
-#include <qwidget.h>
-#include <qpoint.h>
-#include <qlabel.h>
-#include <QInputMethodEvent>
-#include <QTextCharFormat>
+#include <QtCore/QEvent>
+#include <QtCore/QPoint>
+#include <QtGui/QApplication>
+#include <QtGui/QInputMethodEvent>
+#include <QtGui/QLabel>
+#include <QtGui/QTextCharFormat>
+#include <QtGui/QWidget>
 
 #include <ctype.h>
 #include <string.h>
diff --git a/qt4/immodule/quiminputcontext.h b/qt4/immodule/quiminputcontext.h
index e6c5501..7045f2e 100644
--- a/qt4/immodule/quiminputcontext.h
+++ b/qt4/immodule/quiminputcontext.h
@@ -35,8 +35,8 @@
 #ifndef UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_H
 #define UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_H
 
-#include <qinputcontext.h>
-#include <qevent.h>
+#include <QtCore/QEvent>
+#include <QtGui/QInputContext>
 
 #ifdef Q_WS_X11
 #define UIM_QT_USE_JAPANESE_KANA_KEYBOARD_HACK 1
diff --git a/qt4/immodule/quiminputcontext_compose.cpp b/qt4/immodule/quiminputcontext_compose.cpp
index 1d05fea..4fbb64b 100644
--- a/qt4/immodule/quiminputcontext_compose.cpp
+++ b/qt4/immodule/quiminputcontext_compose.cpp
@@ -48,7 +48,7 @@
 
 #include "quiminputcontext.h"
 
-#include <qtextcodec.h>
+#include <QtCore/QTextCodec>
 
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
diff --git a/qt4/immodule/quiminputcontext_with_slave.cpp b/qt4/immodule/quiminputcontext_with_slave.cpp
index 7eff7c7..b0e19da 100644
--- a/qt4/immodule/quiminputcontext_with_slave.cpp
+++ b/qt4/immodule/quiminputcontext_with_slave.cpp
@@ -34,7 +34,7 @@
 
 #include "quiminputcontext_with_slave.h"
 
-#include <qinputcontextfactory.h>
+#include <QtGui/QInputContextFactory>
 
 QUimInputContextWithSlave::QUimInputContextWithSlave( const char *imname, const char *lang )
         : QUimInputContext( imname, lang )
diff --git a/qt4/immodule/subwindow.cpp b/qt4/immodule/subwindow.cpp
index 6e46a1f..a8d6f94 100644
--- a/qt4/immodule/subwindow.cpp
+++ b/qt4/immodule/subwindow.cpp
@@ -34,13 +34,13 @@ SUCH DAMAGE.
 
 //#include <config.h>
 
-#include <qlabel.h>
-#include <qtextbrowser.h>
-#include <qtimer.h>
-#include <qapplication.h>
-#include <QDesktopWidget>
-#include <qrect.h>
-#include <qpoint.h>
+#include <QtCore/QPoint>
+#include <QtCore/QRect>
+#include <QtCore/QTimer>
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopWidget>
+#include <QtGui/QLabel>
+#include <QtGui/QTextBrowser>
 
 const Qt::WFlags subwindowFlag = ( Qt::Window
                                    | Qt::WindowStaysOnTopHint
diff --git a/qt4/immodule/subwindow.h b/qt4/immodule/subwindow.h
index 1561dbf..ecd35cb 100644
--- a/qt4/immodule/subwindow.h
+++ b/qt4/immodule/subwindow.h
@@ -33,8 +33,8 @@ SUCH DAMAGE.
 #ifndef UIM_QT4_IMMODULE_SUBWINDOW_H
 #define UIM_QT4_IMMODULE_SUBWINDOW_H
 
-#include <Q3VBox>
-#include <QTimer>
+#include <QtCore/QTimer>
+#include <Qt3Support/Q3VBox>
 
 class QLabel;
 class QTextBrowser;
-- 
1.6.4.2

0012-avoid-a-warnig-in-qt4-candwin-qt4.cpp.patch

Subject: [PATCH 12/26] avoid a warnig in qt4/candwin/qt4.cpp

---
 qt4/candwin/qt4.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/qt4/candwin/qt4.cpp b/qt4/candwin/qt4.cpp
index ea9efeb..29c1b5f 100644
--- a/qt4/candwin/qt4.cpp
+++ b/qt4/candwin/qt4.cpp
@@ -435,7 +435,7 @@ void CandidateWindow::adjustCandidateWindowSize()
     // FIXME!:
     //    There may be more proper way. Now width is adjusted by indeterminal 3 spaces.
     //    Using QWidget::adjustSize() seems not to work properly...
-    unsigned int maxCharIndex = 0, maxCharCount = 0;
+    int maxCharIndex = 0, maxCharCount = 0;
     for ( int i = 0; i < cList->childCount(); i++ )
     {
         if ( maxCharCount < cList->itemAtIndex( i ) ->text( 1 ).length() )
-- 
1.6.4.2

0013-avoid-warnings-in-quiminputcontext_compose.cpp.patch

Subject: [PATCH 13/26] avoid warnings in quiminputcontext_compose.cpp

---
 qt4/immodule/quiminputcontext_compose.cpp |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qt4/immodule/quiminputcontext_compose.cpp b/qt4/immodule/quiminputcontext_compose.cpp
index 4fbb64b..a78b39a 100644
--- a/qt4/immodule/quiminputcontext_compose.cpp
+++ b/qt4/immodule/quiminputcontext_compose.cpp
@@ -365,7 +365,7 @@ nexttoken(FILE *fp, char **tokenbuf, int *lastch, size_t *buflen)
                 switch (c) {
                 case '\\':
                 case '"':
-                    *p++ = c;
+                    *p++ = static_cast<char>(c);
                     len++;
                     break;
                 case 'n':
@@ -429,12 +429,12 @@ nexttoken(FILE *fp, char **tokenbuf, int *lastch, size_t *buflen)
                     token = ERROR;
                     goto string_error;
                 default:
-                    *p++ = c;
+                    *p++ = static_cast<char>(c);
                     len++;
                     break;
                 }
             } else {
-                *p++ = c;
+                *p++ = static_cast<char>(c);
                 len++;
             }
         }
@@ -457,7 +457,7 @@ nexttoken(FILE *fp, char **tokenbuf, int *lastch, size_t *buflen)
                 *tokenbuf = (char *)realloc(*tokenbuf,  *buflen);
             }
             p = *tokenbuf;
-            *p++ = c;
+            *p++ = static_cast<char>(c);
             len++;
             c = nextch(fp, lastch);
             while (isalnum(c) || c == '_' || c == '-') {
@@ -466,7 +466,7 @@ nexttoken(FILE *fp, char **tokenbuf, int *lastch, size_t *buflen)
                         *tokenbuf = (char *)realloc(*tokenbuf,  *buflen);
                         p = *tokenbuf + len;
                 }
-                *p++ = c;
+                *p++ = static_cast<char>(c);
                 len++;
                 c = nextch(fp, lastch);
             }
-- 
1.6.4.2

0014-use-static_cast-instead-of-C-style-casts.patch

Subject: [PATCH 14/26] use static_cast instead of C style casts

---
 qt4/immodule/quiminputcontext_compose.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qt4/immodule/quiminputcontext_compose.cpp b/qt4/immodule/quiminputcontext_compose.cpp
index a78b39a..e432dac 100644
--- a/qt4/immodule/quiminputcontext_compose.cpp
+++ b/qt4/immodule/quiminputcontext_compose.cpp
@@ -396,7 +396,7 @@ nexttoken(FILE *fp, char **tokenbuf, int *lastch, size_t *buflen)
                         c = nextch(fp, lastch);
                     }
                     putbackch(c, lastch);
-                    *p++ = (char)i;
+                    *p++ = static_cast<char>(i);
                     len++;
                     break;
                 case 'X':
@@ -421,7 +421,7 @@ nexttoken(FILE *fp, char **tokenbuf, int *lastch, size_t *buflen)
                         token = ERROR;
                         goto string_error;
                     }
-                    *p++ = (char)i;
+                    *p++ = static_cast<char>(i);
                     len++;
                     break;
                 case EOF:
-- 
1.6.4.2

0015-remove-QObject-prefixes-which-is-unneeded.patch

Subject: [PATCH 15/26] remove QObject prefixes which is unneeded

---
 qt4/candwin/qt4.cpp                          |    4 ++--
 qt4/immodule/candidatewindow.cpp             |    4 ++--
 qt4/immodule/qhelpermanager.cpp              |    2 +-
 qt4/immodule/quiminputcontext_with_slave.cpp |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/qt4/candwin/qt4.cpp b/qt4/candwin/qt4.cpp
index 29c1b5f..0fdc318 100644
--- a/qt4/candwin/qt4.cpp
+++ b/qt4/candwin/qt4.cpp
@@ -84,7 +84,7 @@ CandidateWindow::CandidateWindow( QWidget *parent, const char * name )
     cList->setVScrollBarMode( Q3ScrollView::AlwaysOff );
     cList->setHScrollBarMode( Q3ScrollView::AlwaysOff );
     cList->setAllColumnsShowFocus( true );
-    QObject::connect( cList, SIGNAL( clicked( Q3ListViewItem * ) ),
+    connect( cList, SIGNAL( clicked( Q3ListViewItem * ) ),
                       this , SLOT( slotCandidateSelected( Q3ListViewItem * ) ) );
 
     //setup NumberLabel
@@ -99,7 +99,7 @@ CandidateWindow::CandidateWindow( QWidget *parent, const char * name )
     isActive = false;
 
     notifier = new QSocketNotifier( 0, QSocketNotifier::Read );
-    QObject::connect( notifier, SIGNAL( activated( int ) ),
+    connect( notifier, SIGNAL( activated( int ) ),
                       this, SLOT( slotStdinActivated( int ) ) );
     hide();
 }
diff --git a/qt4/immodule/candidatewindow.cpp b/qt4/immodule/candidatewindow.cpp
index b6fc677..68cfbe3 100644
--- a/qt4/immodule/candidatewindow.cpp
+++ b/qt4/immodule/candidatewindow.cpp
@@ -83,9 +83,9 @@ CandidateWindow::CandidateWindow( QWidget *parent, const char * name )
     cList->setAllColumnsShowFocus( true );
     QSizePolicy sp( QSizePolicy::Preferred, QSizePolicy::Preferred, false );
     cList->setSizePolicy( sp );
-    QObject::connect( cList, SIGNAL( clicked( Q3ListViewItem * ) ),
+    connect( cList, SIGNAL( clicked( Q3ListViewItem * ) ),
                       this , SLOT( slotCandidateSelected( Q3ListViewItem * ) ) );
-    QObject::connect( cList, SIGNAL( selectionChanged( Q3ListViewItem * ) ),
+    connect( cList, SIGNAL( selectionChanged( Q3ListViewItem * ) ),
                       this , SLOT( slotHookSubwindow( Q3ListViewItem * ) ) );
 
     //setup NumberLabel
diff --git a/qt4/immodule/qhelpermanager.cpp b/qt4/immodule/qhelpermanager.cpp
index 930540f..37adef2 100644
--- a/qt4/immodule/qhelpermanager.cpp
+++ b/qt4/immodule/qhelpermanager.cpp
@@ -79,7 +79,7 @@ void QUimHelperManager::checkHelperConnection()
         if ( im_uim_fd >= 0 )
         {
             notifier = new QSocketNotifier( im_uim_fd, QSocketNotifier::Read );
-            QObject::connect( notifier, SIGNAL( activated( int ) ),
+            connect( notifier, SIGNAL( activated( int ) ),
                               this, SLOT( slotStdinActivated( int ) ) );
         }
     }
diff --git a/qt4/immodule/quiminputcontext_with_slave.cpp b/qt4/immodule/quiminputcontext_with_slave.cpp
index b0e19da..73e7f44 100644
--- a/qt4/immodule/quiminputcontext_with_slave.cpp
+++ b/qt4/immodule/quiminputcontext_with_slave.cpp
@@ -45,10 +45,10 @@ QUimInputContextWithSlave::QUimInputContextWithSlave( const char *imname, const
         slave->setParent( this );
 
         /*
-        QObject::connect( slave, SIGNAL( imEventGenerated( QObject *, QIMEvent * ) ),
+        connect( slave, SIGNAL( imEventGenerated( QObject *, QIMEvent * ) ),
                           this, SIGNAL( imEventGenerated( QObject *, QIMEvent * ) ) );
         */
-        QObject::connect( slave, SIGNAL( deletionRequested() ),
+        connect( slave, SIGNAL( deletionRequested() ),
                           this, SLOT( destroyInputContext() ) );
     }
 }
-- 
1.6.4.2

0016-replace-NULL-with-0.patch

Subject: [PATCH 16/26] replace NULL with 0

---
 qt4/candwin/qt4.cpp                          |    6 +-
 qt4/immodule/candidatewindow.cpp             |    6 +-
 qt4/immodule/plugin.cpp                      |   12 ++--
 qt4/immodule/qhelpermanager.cpp              |    6 +-
 qt4/immodule/qtextutil.cpp                   |   20 +++---
 qt4/immodule/quiminfomanager.cpp             |    2 +-
 qt4/immodule/quiminputcontext.cpp            |   10 +-
 qt4/immodule/quiminputcontext_compose.cpp    |  110 +++++++++++++-------------
 qt4/immodule/quiminputcontext_with_slave.cpp |    2 +-
 9 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/qt4/candwin/qt4.cpp b/qt4/candwin/qt4.cpp
index 0fdc318..975767f 100644
--- a/qt4/candwin/qt4.cpp
+++ b/qt4/candwin/qt4.cpp
@@ -64,7 +64,7 @@ const Qt::WFlags candidateFlag = ( Qt::Window
                                    | Qt::X11BypassWindowManagerHint
 #endif
                                  );
-static QSocketNotifier *notifier = NULL;
+static QSocketNotifier *notifier = 0;
 
 CandidateWindow::CandidateWindow( QWidget *parent, const char * name )
         : Q3VBox( parent, name, candidateFlag )
@@ -124,7 +124,7 @@ void CandidateWindow::activateCand( const QStringList &list )
     stores.clear();
 
     // get charset and create codec
-    QTextCodec *codec = NULL;
+    QTextCodec *codec = 0;
     if ( !list[ 1 ].isEmpty()
         && list[ 1 ].startsWith( QLatin1String( "charset" ) ) )
     {
@@ -288,7 +288,7 @@ void CandidateWindow::setPageCandidates( const QStringList &list )
     int page = 0;
 
     // get charset and create codec
-    QTextCodec *codec = NULL;
+    QTextCodec *codec = 0;
     if ( !list[ 1 ].isEmpty()
         && list[ 1 ].startsWith( QLatin1String( "charset" ) ) )
     {
diff --git a/qt4/immodule/candidatewindow.cpp b/qt4/immodule/candidatewindow.cpp
index 68cfbe3..73f77a9 100644
--- a/qt4/immodule/candidatewindow.cpp
+++ b/qt4/immodule/candidatewindow.cpp
@@ -67,7 +67,7 @@ CandidateWindow::CandidateWindow( QWidget *parent, const char * name )
 {
     setFrameStyle( Raised | NoFrame );
 
-    ic = NULL;
+    ic = 0;
 
     //setup CandidateList
     cList = new CandidateListView( this, "candidateListView" );
@@ -101,7 +101,7 @@ CandidateWindow::CandidateWindow( QWidget *parent, const char * name )
 
     isAlwaysLeft = false;
 
-    subWin = NULL;
+    subWin = 0;
 }
 
 CandidateWindow::~CandidateWindow()
@@ -204,7 +204,7 @@ void CandidateWindow::setNrCandidates( int nrCands, int dLimit )
     // setup dummy candidate
     for ( int i = 0; i < nrCandidates; i++ )
     {
-        uim_candidate d = NULL;
+        uim_candidate d = 0;
         stores.append( d );
     }
 
diff --git a/qt4/immodule/plugin.cpp b/qt4/immodule/plugin.cpp
index 5811737..b0d9fa2 100644
--- a/qt4/immodule/plugin.cpp
+++ b/qt4/immodule/plugin.cpp
@@ -51,7 +51,7 @@
 
 #define UIM_QT_LIST_SUBIM_AS_QTIM 0
 
-QUimInfoManager *UimInputContextPlugin::infoManager = NULL;
+QUimInfoManager *UimInputContextPlugin::infoManager = 0;
 
 
 UimInputContextPlugin::UimInputContextPlugin()
@@ -80,7 +80,7 @@ QInputContext *UimInputContextPlugin::create( const QString & key )
     else
 #endif
     if ( key == "uim" )
-        imname = uim_get_default_im_name( setlocale( LC_ALL, NULL ) );
+        imname = uim_get_default_im_name( setlocale( LC_ALL, 0 ) );
 
     QStringList langs = createLanguageList( key );
     QUimInputContext *uic = new QUimInputContext( imname.toUtf8(),
@@ -143,8 +143,8 @@ QStringList UimInputContextPlugin::createImList() const
     qDebug( "name = uim" );
 
 #if UIM_QT_LIST_SUBIM_AS_QTIM
-    uim_context tmp_uc = uim_create_context( NULL, "UTF-8",
-                         NULL, NULL, uim_iconv, NULL );
+    uim_context tmp_uc = uim_create_context( 0, "UTF-8",
+                         0, 0, uim_iconv, 0 );
     int nr = uim_get_nr_im( tmp_uc );
     if ( uimReady )
     {
@@ -170,8 +170,8 @@ QStringList UimInputContextPlugin::createLanguageList( const QString &key ) cons
         return QStringList() << "ja" << "ko" << "zh" << "*";
 
 #if UIM_QT_LIST_SUBIM_AS_QTIM
-    uim_context tmp_uc = uim_create_context( NULL, "UTF-8",
-                         NULL, NULL, uim_iconv, NULL );
+    uim_context tmp_uc = uim_create_context( 0, "UTF-8",
+                         0, 0, uim_iconv, 0 );
     int nr = uim_get_nr_im( tmp_uc );
     if ( uimReady )
     {
diff --git a/qt4/immodule/qhelpermanager.cpp b/qt4/immodule/qhelpermanager.cpp
index 37adef2..aa26f84 100644
--- a/qt4/immodule/qhelpermanager.cpp
+++ b/qt4/immodule/qhelpermanager.cpp
@@ -50,7 +50,7 @@ SUCH DAMAGE.
 #include "plugin.h"
 
 static int im_uim_fd = 0;
-static QSocketNotifier *notifier = NULL;
+static QSocketNotifier *notifier = 0;
 
 extern QUimInputContext *focusedInputContext;
 extern bool disableFocusedContext;
@@ -60,7 +60,7 @@ extern QList<QUimInputContext *> contextList;
 QUimHelperManager::QUimHelperManager( QObject *parent )
         : QObject( parent )
 {
-    notifier = NULL;
+    notifier = 0;
     im_uim_fd = -1;
 }
 
@@ -135,7 +135,7 @@ void QUimHelperManager::parseHelperStr( const QString &str )
         }
         else if ( str.startsWith( QLatin1String( "focus_in" ) ) )
         {
-            // We shouldn't do "focusedInputContext = NULL" here, because some
+            // We shouldn't do "focusedInputContext = 0" here, because some
             // window manager has some focus related bugs.
             disableFocusedContext = true;
         }
diff --git a/qt4/immodule/qtextutil.cpp b/qt4/immodule/qtextutil.cpp
index 295bf9b..7f2c107 100644
--- a/qt4/immodule/qtextutil.cpp
+++ b/qt4/immodule/qtextutil.cpp
@@ -189,7 +189,7 @@ QUimTextUtil::acquirePrimaryTextInQLineEdit( enum UTextOrigin origin,
         break;
 
     case UTextOrigin_Beginning:
-        *former = NULL;
+        *former = 0;
         if ( latter_req_len >= 0 ) {
             if ( precedence_len >= latter_req_len )
                 text = text.left( latter_req_len );
@@ -233,7 +233,7 @@ QUimTextUtil::acquirePrimaryTextInQLineEdit( enum UTextOrigin origin,
             text = former_text + latter_text;
         }
         *former = strdup( text.utf8() );
-        *latter = NULL;
+        *latter = 0;
         break;
 
     case UTextOrigin_Unspecified:
@@ -317,7 +317,7 @@ QUimTextUtil::acquirePrimaryTextInQTextEdit( enum UTextOrigin origin,
         break;
 
     case UTextOrigin_Beginning:
-        *former = NULL;
+        *former = 0;
 
         start_para = 0;
         start_index = 0;
@@ -383,7 +383,7 @@ QUimTextUtil::acquirePrimaryTextInQTextEdit( enum UTextOrigin origin,
             text += edit->selectedText();
         }
         *former = strdup( text.utf8() );
-        *latter = NULL;
+        *latter = 0;
         break;
 
     case UTextOrigin_Unspecified:
@@ -454,7 +454,7 @@ QUimTextUtil::acquireSelectionTextInQLineEdit( enum UTextOrigin origin,
 
     if ( origin == UTextOrigin_Beginning ||
          ( origin == UTextOrigin_Cursor && cursor_at_beginning ) ) {
-        *former = NULL;
+        *former = 0;
         offset = 0;
         if ( latter_req_len >= 0 ) {
             if ( len > latter_req_len )
@@ -475,7 +475,7 @@ QUimTextUtil::acquireSelectionTextInQLineEdit( enum UTextOrigin origin,
                 return -1;
         }
         *former = strdup( text.mid( offset, len - offset ).utf8() );
-        *latter = NULL;
+        *latter = 0;
     } else {
         return -1;
     }
@@ -514,7 +514,7 @@ QUimTextUtil::acquireSelectionTextInQTextEdit( enum UTextOrigin origin,
 
     if ( origin == UTextOrigin_Beginning ||
          ( origin == UTextOrigin_Cursor && cursor_at_beginning ) ) {
-        *former = NULL;
+        *former = 0;
         offset = 0;
         if ( latter_req_len >= 0 ) {
             if ( len > latter_req_len )
@@ -545,7 +545,7 @@ QUimTextUtil::acquireSelectionTextInQTextEdit( enum UTextOrigin origin,
                 offset = newline + 1;
         }
         *former = strdup( text.mid( offset, len - offset ).utf8() );
-        *latter = NULL;
+        *latter = 0;
     } else {
         edit->setTextFormat( format );
         return -1;
@@ -585,11 +585,11 @@ QUimTextUtil::acquireClipboardText( enum UTextOrigin origin,
                 offset = newline + 1;
         }
         *former = strdup( text.mid( offset, len - offset ).utf8() );
-        *latter = NULL;
+        *latter = 0;
         break;
 
     case UTextOrigin_Beginning:
-        *former = NULL;
+        *former = 0;
         offset = 0;
         if ( latter_req_len >= 0 ) {
             if ( latter_req_len < len )
diff --git a/qt4/immodule/quiminfomanager.cpp b/qt4/immodule/quiminfomanager.cpp
index 7246fb0..a4ffca4 100644
--- a/qt4/immodule/quiminfomanager.cpp
+++ b/qt4/immodule/quiminfomanager.cpp
@@ -60,7 +60,7 @@ QUimInfoManager::initUimInfo()
 {
     info.clear();
 
-    uim_context tmp_uc = uim_create_context( NULL, "UTF-8", NULL, NULL, NULL, NULL );
+    uim_context tmp_uc = uim_create_context( 0, "UTF-8", 0, 0, 0, 0 );
     struct uimInfo ui;
     int nr = uim_get_nr_im( tmp_uc );
     for ( int i = 0; i < nr; i++ )
diff --git a/qt4/immodule/quiminputcontext.cpp b/qt4/immodule/quiminputcontext.cpp
index b108a22..fa235f9 100644
--- a/qt4/immodule/quiminputcontext.cpp
+++ b/qt4/immodule/quiminputcontext.cpp
@@ -64,14 +64,14 @@
 
 #define DEFAULT_SEPARATOR_STR "|"
 
-QUimInputContext *focusedInputContext = NULL;
+QUimInputContext *focusedInputContext = 0;
 bool disableFocusedContext = false;
 
 QList<QUimInputContext*> contextList;
 
 QUimHelperManager * QUimInputContext::m_HelperManager = 0L;
 #ifdef Q_WS_X11
-DefTree *QUimInputContext::mTreeTop = NULL;
+DefTree *QUimInputContext::mTreeTop = 0;
 #endif
 
 static int unicodeToUKey(ushort c);
@@ -126,7 +126,7 @@ QUimInputContext::~QUimInputContext()
 
     if ( this == focusedInputContext )
     {
-        focusedInputContext = NULL;
+        focusedInputContext = 0;
         disableFocusedContext = true;
     }
 
@@ -140,8 +140,8 @@ uim_context QUimInputContext::createUimContext( const char *imname )
     m_imname = imname;
 
     uim_context uc = uim_create_context( this, "UTF-8",
-                                         NULL, ( char * ) imname,
-                                         NULL,
+                                         0, ( char * ) imname,
+                                         0,
                                          QUimInputContext::commit_cb );
 
     m_HelperManager->checkHelperConnection();
diff --git a/qt4/immodule/quiminputcontext_compose.cpp b/qt4/immodule/quiminputcontext_compose.cpp
index e432dac..e736a55 100644
--- a/qt4/immodule/quiminputcontext_compose.cpp
+++ b/qt4/immodule/quiminputcontext_compose.cpp
@@ -68,7 +68,7 @@ static unsigned int KeySymToUcs4(KeySym keysym);
 Compose::Compose(DefTree *top, QUimInputContext *ic)
 {
     m_ic = ic;
-    m_composed = NULL;
+    m_composed = 0;
     m_top = top;
     m_context = top;
 }
@@ -226,7 +226,7 @@ bool Compose::handleKey(KeySym xkeysym, int xkeystate, bool is_push)
 {
     DefTree *p;
 
-    if ((is_push == false)  || m_top == NULL)
+    if ((is_push == false)  || m_top == 0)
         return false;
 
     if (IsModifierKey(xkeysym))
@@ -263,7 +263,7 @@ bool Compose::handleKey(KeySym xkeysym, int xkeystate, bool is_push)
 void Compose::reset()
 {
     m_context = m_top;
-    m_composed = NULL;
+    m_composed = 0;
 }
 
 static int
@@ -500,11 +500,11 @@ modmask(char *name)
         { "Shift",      ShiftMask       },
         { "Alt",        Mod1Mask        },
         { "Meta",       Mod1Mask        },
-        { NULL,         0               }};
+        { 0,         0               }};
 
     p = tbl;
     mask = 0;
-    for (p = tbl; p->name != NULL; p++) {
+    for (p = tbl; p->name != 0; p++) {
         if (strcmp(name, p->name) == 0) {
             mask = p->mask;
             break;
@@ -516,7 +516,7 @@ modmask(char *name)
 char *
 QUimInputContext::TransFileName(char *name)
 {
-    char *home = NULL, *lcCompose = NULL;
+    char *home = 0, *lcCompose = 0;
     char *i = name, *ret, *j;
     int l = 0;
 
@@ -545,7 +545,7 @@ QUimInputContext::TransFileName(char *name)
     }
 
     j = ret = (char *)malloc(l + 1);
-    if (ret == NULL)
+    if (ret == 0)
         return ret;
     i = name;
     while (*i) {
@@ -598,7 +598,7 @@ QUimInputContext::get_encoding()
 #else
     char *p;
 
-    p = setlocale(LC_CTYPE, NULL);
+    p = setlocale(LC_CTYPE, 0);
     if (p)
         p = strchr(p, '.');
 
@@ -613,11 +613,11 @@ QUimInputContext::get_lang_region()
 {
     char *locale, *p;
 
-    locale = setlocale(LC_CTYPE, NULL);
+    locale = setlocale(LC_CTYPE, 0);
     if (locale) {
         locale = strdup(locale);
     } else {
-        return NULL;
+        return 0;
     }
 
     p = strrchr(locale, '.');
@@ -658,7 +658,7 @@ QUimInputContext::parse_compose_line(FILE *fp, char **tokenbuf, size_t *buflen)
     unsigned tmp;
     KeySym keysym = NoSymbol;
     DefTree **top = &mTreeTop;
-    DefTree *p = NULL;
+    DefTree *p = 0;
     Bool exclam, tilde;
     KeySym rhs_keysym = 0;
     char *rhs_string_mb;
@@ -695,11 +695,11 @@ QUimInputContext::parse_compose_line(FILE *fp, char **tokenbuf, size_t *buflen)
             if (token != KEY && token != STRING)
                 goto error;
 
-            if ((filename = TransFileName(*tokenbuf)) == NULL)
+            if ((filename = TransFileName(*tokenbuf)) == 0)
                 goto error;
             infp = fopen(filename, "r");
             free(filename);
-            if (infp == NULL)
+            if (infp == 0)
                 goto error;
             ParseComposeStringFile(infp);
             fclose(infp);
@@ -771,7 +771,7 @@ QUimInputContext::parse_compose_line(FILE *fp, char **tokenbuf, size_t *buflen)
 
     token = nexttoken(fp, tokenbuf, &lastch, buflen);
     if (token == STRING) {
-        if ((rhs_string_mb = (char *)malloc(strlen(*tokenbuf) + 1)) == NULL)
+        if ((rhs_string_mb = (char *)malloc(strlen(*tokenbuf) + 1)) == 0)
             goto error;
         strcpy(rhs_string_mb, *tokenbuf);
         token = nexttoken(fp, tokenbuf, &lastch, buflen);
@@ -803,7 +803,7 @@ QUimInputContext::parse_compose_line(FILE *fp, char **tokenbuf, size_t *buflen)
         } else {
             rhs_string_mb = (char *)malloc(l + 1);
         }
-        if (rhs_string_mb == NULL) {
+        if (rhs_string_mb == 0) {
             goto error;
         }
         memcpy(rhs_string_mb, local_mb_buf, l);
@@ -826,27 +826,27 @@ QUimInputContext::parse_compose_line(FILE *fp, char **tokenbuf, size_t *buflen)
         if (p) {
             top = &p->succession;
         } else {
-            if ((p = (DefTree*)malloc(sizeof(DefTree))) == NULL) {
+            if ((p = (DefTree*)malloc(sizeof(DefTree))) == 0) {
                 free(rhs_string_mb);
                 goto error;
             }
             p->keysym = buf[i].keysym;
             p->modifier = buf[i].modifier;
             p->modifier_mask = buf[i].modifier_mask;
-            p->succession = NULL;
+            p->succession = 0;
             p->next = *top;
-            p->mb = NULL;
-            p->utf8 = NULL;
+            p->mb = 0;
+            p->utf8 = 0;
             p->ks = NoSymbol;
             *top = p;
             top = &p->succession;
         }
     }
 
-    if (p->mb != NULL)
+    if (p->mb != 0)
         free(p->mb);
     p->mb = rhs_string_mb;
-    if (p->utf8 != NULL)
+    if (p->utf8 != 0)
         free(p->utf8);
     p->utf8 = rhs_string_utf8;
     p->ks = rhs_keysym;
@@ -885,7 +885,7 @@ QUimInputContext::ParseComposeStringFile(FILE *fp)
 
         tbp = (char *)malloc(buflen);
         p[0] = tbp;
-        if (tbp != NULL) {
+        if (tbp != 0) {
             while (parse_compose_line(fp, p, &buflen) >= 0) {
             }
             free(p[0]);
@@ -895,49 +895,49 @@ QUimInputContext::ParseComposeStringFile(FILE *fp)
 
 void QUimInputContext::create_compose_tree()
 {
-    FILE *fp = NULL;
-    char *name, *tmpname = NULL;
+    FILE *fp = 0;
+    char *name, *tmpname = 0;
     char *lang_region;
     const char *encoding;
 
     name = getenv("XCOMPOSEFILE");
 
-    if (name == NULL) {
+    if (name == 0) {
         char *home = getenv("HOME");
-        if (home != NULL) {
+        if (home != 0) {
             int hl = strlen(home);
             tmpname = name = (char *)malloc(hl + 10 + 1);
-            if (name != NULL) {
+            if (name != 0) {
                 strcpy(name, home);
                 strcpy(name + hl, "/.XCompose");
                 fp = fopen(name, "r");
-                if (fp == NULL) {
+                if (fp == 0) {
                     free(name);
-                    name = tmpname = NULL;
+                    name = tmpname = 0;
                 }
             }
         }
     }
 
-    if (name == NULL) {
+    if (name == 0) {
         tmpname = name = get_compose_filename();
     }
 
-    if (name == NULL)
+    if (name == 0)
         return;
-    if (fp == NULL) {
+    if (fp == 0) {
         fp = fopen(name, "r");
     }
-    if (tmpname != NULL) {
+    if (tmpname != 0) {
         free(tmpname);
     }
-    if (fp == NULL)
+    if (fp == 0)
         return;
 
     lang_region = get_lang_region();
     encoding = get_encoding();
-    if (lang_region == NULL || encoding == NULL) {
-        fprintf(stderr, "Warning: locale name is NULL\n");
+    if (lang_region == 0 || encoding == 0) {
+        fprintf(stderr, "Warning: locale name is 0\n");
         fclose(fp);
         free(lang_region);
         return;
@@ -956,60 +956,60 @@ char *QUimInputContext::get_compose_filename()
     const char *encoding;
 
     FILE *fp;
-    char buf[XLC_BUFSIZE], *name = NULL, *filename = NULL;
+    char buf[XLC_BUFSIZE], *name = 0, *filename = 0;
     const char *xlib_dir = XLIB_DIR ;
 
     lang_region = get_lang_region();
     encoding = get_encoding();
 
-    if (lang_region == NULL || encoding == NULL) {
+    if (lang_region == 0 || encoding == 0) {
         free(lang_region);
-        return NULL;
+        return 0;
     }
 
     locale = (char *)malloc(strlen(lang_region) + strlen(encoding) + 2);
-    if (locale == NULL) {
+    if (locale == 0) {
         free(lang_region);
-        return NULL;
+        return 0;
     }
     sprintf(locale, "%s.%s", lang_region, encoding);
     free(lang_region);
 
     compose_dir_file = (char *)malloc(strlen(XLIB_DIR) + strlen(COMPOSE_DIR_FILE) + 2);
-    if (compose_dir_file == NULL) {
+    if (compose_dir_file == 0) {
         free(locale);
-        return NULL;
+        return 0;
     }
     sprintf(compose_dir_file, "%s/%s", XLIB_DIR, COMPOSE_DIR_FILE);
 
     fp = fopen(compose_dir_file, "r");
-    if (fp == NULL) {
+    if (fp == 0) {
         /* retry with fallback file */
         if (strcmp(FALLBACK_XLIB_DIR, XLIB_DIR)) {
             compose_dir_file = (char *)realloc(compose_dir_file,
                             strlen(FALLBACK_XLIB_DIR) +
                             strlen(COMPOSE_DIR_FILE) + 2);
-            if (compose_dir_file == NULL) {
+            if (compose_dir_file == 0) {
                 free(locale);
-                return NULL;
+                return 0;
             }
             sprintf(compose_dir_file, "%s/%s",
                             FALLBACK_XLIB_DIR, COMPOSE_DIR_FILE);
             fp = fopen(compose_dir_file, "r");
-            if (fp == NULL) {
+            if (fp == 0) {
                 free(locale);
                 free(compose_dir_file);
-                return NULL;
+                return 0;
             }
             xlib_dir = FALLBACK_XLIB_DIR;
         } else {
             free(locale);
             free(compose_dir_file);
-            return NULL;
+            return 0;
         }
     }
 
-    while (fgets(buf, XLC_BUFSIZE, fp) != NULL) {
+    while (fgets(buf, XLC_BUFSIZE, fp) != 0) {
         char *p = buf;
         int n;
         char *args[2], *from, *to;
@@ -1027,7 +1027,7 @@ char *QUimInputContext::get_compose_filename()
         from = args[1], to = args[0];
         if (!strcmp(from, locale)) {
             name = (char *)malloc(strlen(to) + 1);
-            if (name != NULL) {
+            if (name != 0) {
                 strcpy(name, to);
             }
             break;
@@ -1037,13 +1037,13 @@ char *QUimInputContext::get_compose_filename()
     free(locale);
     free(compose_dir_file);
 
-    if (name == NULL)
-        return NULL;
+    if (name == 0)
+        return 0;
 
     filename = (char *)malloc(strlen(xlib_dir) + strlen(XLOCALE_DIR) +
                     strlen(name) + 3);
-    if (filename == NULL)
-        return NULL;
+    if (filename == 0)
+        return 0;
     sprintf(filename, "%s/%s/%s", xlib_dir, XLOCALE_DIR, name);
     free(name);
 
diff --git a/qt4/immodule/quiminputcontext_with_slave.cpp b/qt4/immodule/quiminputcontext_with_slave.cpp
index 73e7f44..7cf24e4 100644
--- a/qt4/immodule/quiminputcontext_with_slave.cpp
+++ b/qt4/immodule/quiminputcontext_with_slave.cpp
@@ -39,7 +39,7 @@
 QUimInputContextWithSlave::QUimInputContextWithSlave( const char *imname, const char *lang )
         : QUimInputContext( imname, lang )
 {
-    slave = QInputContextFactory::create( "simple", NULL );
+    slave = QInputContextFactory::create( "simple", 0 );
     if ( slave )
     {
         slave->setParent( this );
-- 
1.6.4.2

0017-don-t-include-deprecated-headers.patch

Subject: [PATCH 17/26] don't include deprecated headers

---
 qt4/candwin/qt4.cpp                       |    9 ++++-----
 qt4/immodule/qtextutil.cpp                |    2 +-
 qt4/immodule/quiminputcontext.cpp         |    4 ++--
 qt4/immodule/quiminputcontext_compose.cpp |   12 ++++++------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/qt4/candwin/qt4.cpp b/qt4/candwin/qt4.cpp
index 975767f..2f204e8 100644
--- a/qt4/candwin/qt4.cpp
+++ b/qt4/candwin/qt4.cpp
@@ -44,12 +44,11 @@
 #include <QtGui/QWidget>
 #include <Qt3Support/Q3Header>
 
-#include <locale.h>
-#include <stdio.h>
-#include <string.h>
+#include <clocale>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
-#include <stdlib.h>
-
 
 #include "qtgettext.h"
 
diff --git a/qt4/immodule/qtextutil.cpp b/qt4/immodule/qtextutil.cpp
index 7f2c107..e342071 100644
--- a/qt4/immodule/qtextutil.cpp
+++ b/qt4/immodule/qtextutil.cpp
@@ -36,7 +36,7 @@ SUCH DAMAGE.
 
 //#include <config.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <QtGui/QApplication>
 #include <QtGui/QClipboard>
diff --git a/qt4/immodule/quiminputcontext.cpp b/qt4/immodule/quiminputcontext.cpp
index fa235f9..72e2d9f 100644
--- a/qt4/immodule/quiminputcontext.cpp
+++ b/qt4/immodule/quiminputcontext.cpp
@@ -41,8 +41,8 @@
 #include <QtGui/QTextCharFormat>
 #include <QtGui/QWidget>
 
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
 
 #include "debug.h"
 #include "quiminputcontext_compose.h"
diff --git a/qt4/immodule/quiminputcontext_compose.cpp b/qt4/immodule/quiminputcontext_compose.cpp
index e736a55..d625362 100644
--- a/qt4/immodule/quiminputcontext_compose.cpp
+++ b/qt4/immodule/quiminputcontext_compose.cpp
@@ -33,13 +33,13 @@
 
 #include <config.h>
 
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cctype>
+#include <cerrno>
+#include <clocale>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <sys/stat.h>
-#include <locale.h>
-#include <errno.h>
 #ifdef HAVE_LANGINFO_CODESET
 #include <langinfo.h>
 #endif
-- 
1.6.4.2

0018-don-t-use-define-if-possible.patch

Subject: [PATCH 18/26] don't use #define if possible

---
 qt4/immodule/quiminputcontext.cpp         |    2 +-
 qt4/immodule/quiminputcontext_compose.cpp |   48 +++++++++++++++-------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/qt4/immodule/quiminputcontext.cpp b/qt4/immodule/quiminputcontext.cpp
index 72e2d9f..32f5732 100644
--- a/qt4/immodule/quiminputcontext.cpp
+++ b/qt4/immodule/quiminputcontext.cpp
@@ -62,7 +62,7 @@
 #include "uim/uim-x-util.h"
 #endif
 
-#define DEFAULT_SEPARATOR_STR "|"
+static const char DEFAULT_SEPARATOR_STR[] = "|";
 
 QUimInputContext *focusedInputContext = 0;
 bool disableFocusedContext = false;
diff --git a/qt4/immodule/quiminputcontext_compose.cpp b/qt4/immodule/quiminputcontext_compose.cpp
index d625362..89de4fd 100644
--- a/qt4/immodule/quiminputcontext_compose.cpp
+++ b/qt4/immodule/quiminputcontext_compose.cpp
@@ -54,13 +54,16 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-#define COMPOSE_FILE        "Compose"
-#define COMPOSE_DIR_FILE        "X11/locale/compose.dir"
-#define XLOCALE_DIR        "X11/locale"
-#define FALLBACK_XLIB_DIR        "/usr/X11R6/lib"
-
 #define XLC_BUFSIZE        256
-#define iscomment(ch)        ((ch) == '#' || (ch) == '\0')
+
+static const char COMPOSE_DIR_FILE[] = "X11/locale/compose.dir";
+static const char XLOCALE_DIR[] = "X11/locale";
+static const char FALLBACK_XLIB_DIR[] = "/usr/X11R6/lib";
+
+static inline bool iscomment(char ch)
+{
+    return ch == '#' || ch == '\0';
+}
 
 static int parse_line(char *line, char **argv, int argsize);
 static unsigned int KeySymToUcs4(KeySym keysym);
@@ -296,23 +299,25 @@ putbackch(int c, int *lastch)
 }
 
 
-#define ENDOFFILE 0
-#define ENDOFLINE 1
-#define COLON 2
-#define LESS 3
-#define GREATER 4
-#define EXCLAM 5
-#define TILDE 6
-#define STRING 7
-#define KEY 8
-#define ERROR 9
+static const int ENDOFFILE = 0;
+static const int ENDOFLINE = 1;
+static const int COLON = 2;
+static const int LESS = 3;
+static const int GREATER = 4;
+static const int EXCLAM = 5;
+static const int TILDE = 6;
+static const int STRING = 7;
+static const int KEY = 8;
+static const int ERROR = 9;
 
 
 #ifndef isalnum
-#define isalnum(c)      \
-    (('0' <= (c) && (c) <= '9')  || \
-     ('A' <= (c) && (c) <= 'Z')  || \
-     ('a' <= (c) && (c) <= 'z'))
+static inline bool isalnum(char c)
+{
+    return ('0' <= c && c <= '9')  ||
+        ('A' <= c && c <= 'Z')  ||
+        ('a' <= c && c <= 'z');
+}
 #endif
 
 static int
@@ -645,8 +650,7 @@ QUimInputContext::get_mb_string(char *buf, unsigned int ks)
     return len;
 }
 
-#define AllMask (ShiftMask | LockMask | ControlMask | Mod1Mask)
-#define LOCAL_UTF8_BUFSIZE 256
+static const unsigned AllMask = ShiftMask | LockMask | ControlMask | Mod1Mask;
 #define SEQUENCE_MAX    10
 
 int
-- 
1.6.4.2

0019-change-including-orders.patch

Subject: [PATCH 19/26] change including orders

---
 qt4/candwin/qt4.cpp                       |   14 +++++++-------
 qt4/candwin/qt4.h                         |   11 ++++++-----
 qt4/immodule/candidatewindow.cpp          |    4 +---
 qt4/immodule/candidatewindow.h            |    8 ++++----
 qt4/immodule/plugin.cpp                   |    1 -
 qt4/immodule/qhelpermanager.cpp           |    8 +++-----
 qt4/immodule/qhelpermanager.h             |    2 +-
 qt4/immodule/qtextutil.cpp                |    4 ----
 qt4/immodule/qtextutil.h                  |    1 -
 qt4/immodule/quiminfomanager.cpp          |    4 ----
 qt4/immodule/quiminputcontext.cpp         |   18 +++++++++---------
 qt4/immodule/quiminputcontext.h           |    2 +-
 qt4/immodule/quiminputcontext_compose.cpp |    8 ++++----
 qt4/immodule/quiminputcontext_compose.h   |    1 +
 qt4/immodule/subwindow.cpp                |    2 --
 15 files changed, 37 insertions(+), 51 deletions(-)

diff --git a/qt4/candwin/qt4.cpp b/qt4/candwin/qt4.cpp
index 2f204e8..dff9a58 100644
--- a/qt4/candwin/qt4.cpp
+++ b/qt4/candwin/qt4.cpp
@@ -30,9 +30,15 @@
  SUCH DAMAGE.
 
 */
+#include <config.h>
+
 #include "qt4.h"
 
-#include <config.h>
+#include <clocale>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <unistd.h>
 
 #include <QtCore/QRect>
 #include <QtCore/QSocketNotifier>
@@ -44,12 +50,6 @@
 #include <QtGui/QWidget>
 #include <Qt3Support/Q3Header>
 
-#include <clocale>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <unistd.h>
-
 #include "qtgettext.h"
 
 static const int NR_CANDIDATES = 10;
diff --git a/qt4/candwin/qt4.h b/qt4/candwin/qt4.h
index b0a624e..eb37391 100644
--- a/qt4/candwin/qt4.h
+++ b/qt4/candwin/qt4.h
@@ -33,17 +33,18 @@
 #ifndef UIM_QT4_CANDWIN_QT_H
 #define UIM_QT4_CANDWIN_QT_H
 
-#include <uim/uim.h>
-#include <uim/uim-helper.h>
-
 #include <Qt3Support/Q3ListView>
 #include <Qt3Support/Q3VBox>
 #include <Qt3Support/Q3ValueList>
 
+#include <uim/uim.h>
+#include <uim/uim-helper.h>
+
 class QLabel;
-class CandidateListView;
-class QStringList;
 class QPoint;
+class QStringList;
+
+class CandidateListView;
 
 struct CandData
 {
diff --git a/qt4/immodule/candidatewindow.cpp b/qt4/immodule/candidatewindow.cpp
index 73f77a9..941971c 100644
--- a/qt4/immodule/candidatewindow.cpp
+++ b/qt4/immodule/candidatewindow.cpp
@@ -32,8 +32,6 @@ SUCH DAMAGE.
 */
 #include "candidatewindow.h"
 
-//#include <config.h>
-
 #include <QtCore/QEvent>
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopWidget>
@@ -44,8 +42,8 @@ SUCH DAMAGE.
 #include "uim/uim.h"
 
 #include "debug.h"
-#include "subwindow.h"
 #include "quiminputcontext.h"
+#include "subwindow.h"
 
 static const int MIN_CAND_WIDTH = 80;
 
diff --git a/qt4/immodule/candidatewindow.h b/qt4/immodule/candidatewindow.h
index 9281aeb..e411f46 100644
--- a/qt4/immodule/candidatewindow.h
+++ b/qt4/immodule/candidatewindow.h
@@ -33,18 +33,18 @@ SUCH DAMAGE.
 #ifndef UIM_QT4_IMMODULE_CANDIDATE_WINDOW_H
 #define UIM_QT4_IMMODULE_CANDIDATE_WINDOW_H
 
-#include <uim/uim.h>
-
 #include <QtCore/QEvent>
 #include <QtGui/QFontMetrics>
-#include <Qt3Support/Q3VBox>
 #include <Qt3Support/Q3ListView>
+#include <Qt3Support/Q3VBox>
 #include <Qt3Support/Q3ValueList>
 
+#include <uim/uim.h>
+
 class QLabel;
 
-class QUimInputContext;
 class CandidateListView;
+class QUimInputContext;
 class SubWindow;
 
 class CandidateWindow : public Q3VBox
diff --git a/qt4/immodule/plugin.cpp b/qt4/immodule/plugin.cpp
index b0d9fa2..a2369d5 100644
--- a/qt4/immodule/plugin.cpp
+++ b/qt4/immodule/plugin.cpp
@@ -53,7 +53,6 @@
 
 QUimInfoManager *UimInputContextPlugin::infoManager = 0;
 
-
 UimInputContextPlugin::UimInputContextPlugin()
 {
     uimReady = false;
diff --git a/qt4/immodule/qhelpermanager.cpp b/qt4/immodule/qhelpermanager.cpp
index aa26f84..b596e8b 100644
--- a/qt4/immodule/qhelpermanager.cpp
+++ b/qt4/immodule/qhelpermanager.cpp
@@ -32,8 +32,6 @@ SUCH DAMAGE.
 */
 #include "qhelpermanager.h"
 
-//#include <config.h>
-
 #include <QtCore/QSocketNotifier>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
@@ -41,13 +39,13 @@ SUCH DAMAGE.
 #include <Qt3Support/Q3PtrList>
 
 #include "uim/uim.h"
-#include "uim/uim-util.h"
 #include "uim/uim-helper.h"
 #include "uim/uim-im-switcher.h"
+#include "uim/uim-util.h"
 
-#include "quiminputcontext.h"
-#include "quiminfomanager.h"
 #include "plugin.h"
+#include "quiminfomanager.h"
+#include "quiminputcontext.h"
 
 static int im_uim_fd = 0;
 static QSocketNotifier *notifier = 0;
diff --git a/qt4/immodule/qhelpermanager.h b/qt4/immodule/qhelpermanager.h
index c1e7481..b7f4e4c 100644
--- a/qt4/immodule/qhelpermanager.h
+++ b/qt4/immodule/qhelpermanager.h
@@ -35,8 +35,8 @@ SUCH DAMAGE.
 
 #include <QtCore/QObject>
 
-class QString;
 class QSocketNotifier;
+class QString;
 
 class QUimHelperManager : public QObject
 {
diff --git a/qt4/immodule/qtextutil.cpp b/qt4/immodule/qtextutil.cpp
index e342071..cf478f4 100644
--- a/qt4/immodule/qtextutil.cpp
+++ b/qt4/immodule/qtextutil.cpp
@@ -30,12 +30,9 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
 */
-
 // FIXME: Support Qt4 TextEdit
 #include "qtextutil.h"
 
-//#include <config.h>
-
 #include <cstdlib>
 
 #include <QtGui/QApplication>
@@ -48,7 +45,6 @@ SUCH DAMAGE.
 
 #include "quiminputcontext.h"
 
-
 QUimTextUtil::QUimTextUtil( QObject *parent )
         : QObject( parent )
 {
diff --git a/qt4/immodule/qtextutil.h b/qt4/immodule/qtextutil.h
index 0fe8355..8e2d853 100644
--- a/qt4/immodule/qtextutil.h
+++ b/qt4/immodule/qtextutil.h
@@ -37,7 +37,6 @@ SUCH DAMAGE.
 
 #include "uim/uim.h"
 
-
 class QUimInputContext;
 
 class QUimTextUtil : QObject
diff --git a/qt4/immodule/quiminfomanager.cpp b/qt4/immodule/quiminfomanager.cpp
index a4ffca4..421437a 100644
--- a/qt4/immodule/quiminfomanager.cpp
+++ b/qt4/immodule/quiminfomanager.cpp
@@ -32,14 +32,10 @@ SUCH DAMAGE.
 */
 #include "quiminfomanager.h"
 
-//#include <config.h>
-
 #include <Qt3Support/Q3ValueList>
 
 #include "uim/uim.h"
 
-
-
 QUimInfoManager::QUimInfoManager()
 {
     initUimInfo();
diff --git a/qt4/immodule/quiminputcontext.cpp b/qt4/immodule/quiminputcontext.cpp
index 32f5732..e366c78 100644
--- a/qt4/immodule/quiminputcontext.cpp
+++ b/qt4/immodule/quiminputcontext.cpp
@@ -33,6 +33,9 @@
 */
 #include "quiminputcontext.h"
 
+#include <cctype>
+#include <cstring>
+
 #include <QtCore/QEvent>
 #include <QtCore/QPoint>
 #include <QtGui/QApplication>
@@ -41,20 +44,17 @@
 #include <QtGui/QTextCharFormat>
 #include <QtGui/QWidget>
 
-#include <cctype>
-#include <cstring>
+#include <uim/uim.h>
+#include <uim/uim-im-switcher.h>
+#include <uim/uim-scm.h>
 
+#include "candidatewindow.h"
 #include "debug.h"
-#include "quiminputcontext_compose.h"
 #include "plugin.h"
-#include "candidatewindow.h"
-#include "quiminfomanager.h"
 #include "qhelpermanager.h"
 #include "qtextutil.h"
-
-#include <uim/uim.h>
-#include <uim/uim-scm.h>
-#include <uim/uim-im-switcher.h>
+#include "quiminfomanager.h"
+#include "quiminputcontext_compose.h"
 
 #if UIM_QT_USE_JAPANESE_KANA_KEYBOARD_HACK
 #include <X11/Xlib.h>
diff --git a/qt4/immodule/quiminputcontext.h b/qt4/immodule/quiminputcontext.h
index 7045f2e..a714362 100644
--- a/qt4/immodule/quiminputcontext.h
+++ b/qt4/immodule/quiminputcontext.h
@@ -49,11 +49,11 @@
 
 class CandidateWindow;
 class QUimHelperManager;
+class QUimTextUtil;
 #ifdef Q_WS_X11
 typedef struct _DefTree DefTree;
 class Compose;
 #endif
-class QUimTextUtil;
 
 class PreeditSegment
 {
diff --git a/qt4/immodule/quiminputcontext_compose.cpp b/qt4/immodule/quiminputcontext_compose.cpp
index 89de4fd..028c048 100644
--- a/qt4/immodule/quiminputcontext_compose.cpp
+++ b/qt4/immodule/quiminputcontext_compose.cpp
@@ -29,10 +29,10 @@
   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   SUCH DAMAGE.
 */
-#include "quiminputcontext_compose.h"
-
 #include <config.h>
 
+#include "quiminputcontext_compose.h"
+
 #include <cctype>
 #include <cerrno>
 #include <clocale>
@@ -44,12 +44,12 @@
 #include <langinfo.h>
 #endif
 
+#include <QtCore/QTextCodec>
+
 #include "uim/uim.h"
 
 #include "quiminputcontext.h"
 
-#include <QtCore/QTextCodec>
-
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/qt4/immodule/quiminputcontext_compose.h b/qt4/immodule/quiminputcontext_compose.h
index 260cdd3..1ac8d57 100644
--- a/qt4/immodule/quiminputcontext_compose.h
+++ b/qt4/immodule/quiminputcontext_compose.h
@@ -58,6 +58,7 @@ typedef struct _DefTree {
 } DefTree;
 
 class QUimInputContext;
+
 class Compose {
 public:
     Compose(DefTree *, QUimInputContext *);
diff --git a/qt4/immodule/subwindow.cpp b/qt4/immodule/subwindow.cpp
index a8d6f94..e884d92 100644
--- a/qt4/immodule/subwindow.cpp
+++ b/qt4/immodule/subwindow.cpp
@@ -32,8 +32,6 @@ SUCH DAMAGE.
 */
 #include "subwindow.h"
 
-//#include <config.h>
-
 #include <QtCore/QPoint>
 #include <QtCore/QRect>
 #include <QtCore/QTimer>
-- 
1.6.4.2

0020-remove-unneeded-include.patch

Subject: [PATCH 20/26] remove unneeded #include

---
 qt4/candwin/qt4.cpp               |    2 --
 qt4/edittest/main.cpp             |    1 -
 qt4/immodule/candidatewindow.cpp  |    3 ---
 qt4/immodule/candidatewindow.h    |    2 --
 qt4/immodule/plugin.cpp           |    2 --
 qt4/immodule/plugin.h             |    3 ++-
 qt4/immodule/qhelpermanager.cpp   |    1 -
 qt4/immodule/qtextutil.cpp        |    3 ---
 qt4/immodule/quiminfomanager.cpp  |    2 --
 qt4/immodule/quiminputcontext.cpp |    3 ---
 qt4/immodule/quiminputcontext.h   |    3 ++-
 qt4/immodule/subwindow.cpp        |    1 -
 12 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/qt4/candwin/qt4.cpp b/qt4/candwin/qt4.cpp
index dff9a58..934e20e 100644
--- a/qt4/candwin/qt4.cpp
+++ b/qt4/candwin/qt4.cpp
@@ -40,14 +40,12 @@
 #include <cstring>
 #include <unistd.h>
 
-#include <QtCore/QRect>
 #include <QtCore/QSocketNotifier>
 #include <QtCore/QStringList>
 #include <QtCore/QTextCodec>
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopWidget>
 #include <QtGui/QLabel>
-#include <QtGui/QWidget>
 #include <Qt3Support/Q3Header>
 
 #include "qtgettext.h"
diff --git a/qt4/edittest/main.cpp b/qt4/edittest/main.cpp
index b422277..38aad26 100644
--- a/qt4/edittest/main.cpp
+++ b/qt4/edittest/main.cpp
@@ -31,7 +31,6 @@
   SUCH DAMAGE.
 
 */
-
 #include <QtGui/QApplication>
 #include <QtGui/QLabel>
 #include <QtGui/QLineEdit>
diff --git a/qt4/immodule/candidatewindow.cpp b/qt4/immodule/candidatewindow.cpp
index 941971c..70380ae 100644
--- a/qt4/immodule/candidatewindow.cpp
+++ b/qt4/immodule/candidatewindow.cpp
@@ -32,15 +32,12 @@ SUCH DAMAGE.
 */
 #include "candidatewindow.h"
 
-#include <QtCore/QEvent>
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopWidget>
 #include <QtGui/QFontMetrics>
 #include <QtGui/QLabel>
 #include <Qt3Support/Q3Header>
 
-#include "uim/uim.h"
-
 #include "debug.h"
 #include "quiminputcontext.h"
 #include "subwindow.h"
diff --git a/qt4/immodule/candidatewindow.h b/qt4/immodule/candidatewindow.h
index e411f46..79ac155 100644
--- a/qt4/immodule/candidatewindow.h
+++ b/qt4/immodule/candidatewindow.h
@@ -33,8 +33,6 @@ SUCH DAMAGE.
 #ifndef UIM_QT4_IMMODULE_CANDIDATE_WINDOW_H
 #define UIM_QT4_IMMODULE_CANDIDATE_WINDOW_H
 
-#include <QtCore/QEvent>
-#include <QtGui/QFontMetrics>
 #include <Qt3Support/Q3ListView>
 #include <Qt3Support/Q3VBox>
 #include <Qt3Support/Q3ValueList>
diff --git a/qt4/immodule/plugin.cpp b/qt4/immodule/plugin.cpp
index a2369d5..fd6e556 100644
--- a/qt4/immodule/plugin.cpp
+++ b/qt4/immodule/plugin.cpp
@@ -35,9 +35,7 @@
 #include "plugin.h"
 
 #include <QtCore/QStringList>
-#include <QtGui/QApplication>
 #include <QtGui/QInputContext>
-#include <QtGui/QInputContextPlugin>
 #ifdef Q_WS_X11
 #include <QtGui/QX11Info>
 #endif
diff --git a/qt4/immodule/plugin.h b/qt4/immodule/plugin.h
index 9d6db2d..556d8af 100644
--- a/qt4/immodule/plugin.h
+++ b/qt4/immodule/plugin.h
@@ -34,9 +34,10 @@
 #ifndef UIM_QT4_IMMODULE_PLUGIN_H
 #define UIM_QT4_IMMODULE_PLUGIN_H
 
-#include <QtCore/QStringList>
 #include <QtGui/QInputContextPlugin>
 
+class QStringList;
+
 class QUimInfoManager;
 
 class UimInputContextPlugin : public QInputContextPlugin
diff --git a/qt4/immodule/qhelpermanager.cpp b/qt4/immodule/qhelpermanager.cpp
index b596e8b..b0771eb 100644
--- a/qt4/immodule/qhelpermanager.cpp
+++ b/qt4/immodule/qhelpermanager.cpp
@@ -36,7 +36,6 @@ SUCH DAMAGE.
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QTextCodec>
-#include <Qt3Support/Q3PtrList>
 
 #include "uim/uim.h"
 #include "uim/uim-helper.h"
diff --git a/qt4/immodule/qtextutil.cpp b/qt4/immodule/qtextutil.cpp
index cf478f4..f306b02 100644
--- a/qt4/immodule/qtextutil.cpp
+++ b/qt4/immodule/qtextutil.cpp
@@ -38,11 +38,8 @@ SUCH DAMAGE.
 #include <QtGui/QApplication>
 #include <QtGui/QClipboard>
 #include <QtGui/QLineEdit>
-#include <QtGui/QWidget>
 #include <Qt3Support/Q3TextEdit>
 
-#include "uim/uim.h"
-
 #include "quiminputcontext.h"
 
 QUimTextUtil::QUimTextUtil( QObject *parent )
diff --git a/qt4/immodule/quiminfomanager.cpp b/qt4/immodule/quiminfomanager.cpp
index 421437a..75c12f5 100644
--- a/qt4/immodule/quiminfomanager.cpp
+++ b/qt4/immodule/quiminfomanager.cpp
@@ -32,8 +32,6 @@ SUCH DAMAGE.
 */
 #include "quiminfomanager.h"
 
-#include <Qt3Support/Q3ValueList>
-
 #include "uim/uim.h"
 
 QUimInfoManager::QUimInfoManager()
diff --git a/qt4/immodule/quiminputcontext.cpp b/qt4/immodule/quiminputcontext.cpp
index e366c78..4980e90 100644
--- a/qt4/immodule/quiminputcontext.cpp
+++ b/qt4/immodule/quiminputcontext.cpp
@@ -38,13 +38,10 @@
 
 #include <QtCore/QEvent>
 #include <QtCore/QPoint>
-#include <QtGui/QApplication>
 #include <QtGui/QInputMethodEvent>
-#include <QtGui/QLabel>
 #include <QtGui/QTextCharFormat>
 #include <QtGui/QWidget>
 
-#include <uim/uim.h>
 #include <uim/uim-im-switcher.h>
 #include <uim/uim-scm.h>
 
diff --git a/qt4/immodule/quiminputcontext.h b/qt4/immodule/quiminputcontext.h
index a714362..7c96546 100644
--- a/qt4/immodule/quiminputcontext.h
+++ b/qt4/immodule/quiminputcontext.h
@@ -35,7 +35,6 @@
 #ifndef UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_H
 #define UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_H
 
-#include <QtCore/QEvent>
 #include <QtGui/QInputContext>
 
 #ifdef Q_WS_X11
@@ -47,6 +46,8 @@
 #include <uim/uim-helper.h>
 #include <uim/uim-util.h>
 
+class QEvent;
+
 class CandidateWindow;
 class QUimHelperManager;
 class QUimTextUtil;
diff --git a/qt4/immodule/subwindow.cpp b/qt4/immodule/subwindow.cpp
index e884d92..1402853 100644
--- a/qt4/immodule/subwindow.cpp
+++ b/qt4/immodule/subwindow.cpp
@@ -34,7 +34,6 @@ SUCH DAMAGE.
 
 #include <QtCore/QPoint>
 #include <QtCore/QRect>
-#include <QtCore/QTimer>
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopWidget>
 #include <QtGui/QLabel>
-- 
1.6.4.2