Revision: 6204
Author: nogu.dev
Date: Sun Feb 28 15:00:48 2010
Log: * qt4/immodule/candidatewindow.cpp
* qt4/immodule/candidatewindow.h
* qt4/immodule/plugin.cpp
* qt4/immodule/plugin.h
* qt4/immodule/qhelpermanager.cpp
* qt4/immodule/qhelpermanager.h
* qt4/immodule/qtextutil.cpp
* qt4/immodule/qtextutil.h
* qt4/immodule/quiminfomanager.cpp
* qt4/immodule/quiminputcontext.cpp
* qt4/immodule/quiminputcontext.h
* qt4/immodule/quiminputcontext_compose.cpp
* qt4/immodule/quiminputcontext_compose.h
* qt4/immodule/subwindow.cpp
- Change include order.
http://code.google.com/p/uim/source/detail?r=6204
Modified:
/trunk/qt4/immodule/candidatewindow.cpp
/trunk/qt4/immodule/candidatewindow.h
/trunk/qt4/immodule/plugin.cpp
/trunk/qt4/immodule/plugin.h
/trunk/qt4/immodule/qhelpermanager.cpp
/trunk/qt4/immodule/qhelpermanager.h
/trunk/qt4/immodule/qtextutil.cpp
/trunk/qt4/immodule/qtextutil.h
/trunk/qt4/immodule/quiminfomanager.cpp
/trunk/qt4/immodule/quiminputcontext.cpp
/trunk/qt4/immodule/quiminputcontext.h
/trunk/qt4/immodule/quiminputcontext_compose.cpp
/trunk/qt4/immodule/quiminputcontext_compose.h
/trunk/qt4/immodule/subwindow.cpp
=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp Sun Feb 28 15:00:02 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp Sun Feb 28 15:00:48 2010
@@ -30,24 +30,18 @@
SUCH DAMAGE.
*/
-
-//#include <config.h>
-
-#include <QtCore/QEvent>
+#include "candidatewindow.h"
+
#include <QtGui/QApplication>
#include <QtGui/QDesktopWidget>
#include <QtGui/QFontMetrics>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
-#include <QtGui/QTableWidget>
#include <QtGui/QVBoxLayout>
-#include "uim/uim.h"
-
#include "debug.h"
-#include "candidatewindow.h"
-#include "subwindow.h"
#include "quiminputcontext.h"
+#include "subwindow.h"
static const int MIN_CAND_WIDTH = 80;
=======================================
--- /trunk/qt4/immodule/candidatewindow.h Sun Feb 28 14:58:56 2010
+++ /trunk/qt4/immodule/candidatewindow.h Sun Feb 28 15:00:48 2010
@@ -33,16 +33,15 @@
#ifndef UIM_QT4_IMMODULE_CANDIDATE_WINDOW_H
#define UIM_QT4_IMMODULE_CANDIDATE_WINDOW_H
-#include <uim/uim.h>
-
#include <QtCore/QList>
#include <QtGui/QTableWidget>
+#include <uim/uim.h>
+
class QLabel;
-class QTableWidgetItem;
-
-class QUimInputContext;
+
class CandidateListView;
+class QUimInputContext;
class SubWindow;
class CandidateWindow : public QFrame
=======================================
--- /trunk/qt4/immodule/plugin.cpp Sun Feb 28 15:00:02 2010
+++ /trunk/qt4/immodule/plugin.cpp Sun Feb 28 15:00:48 2010
@@ -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
=======================================
--- /trunk/qt4/immodule/plugin.h Sun Feb 28 15:00:02 2010
+++ /trunk/qt4/immodule/plugin.h Sun Feb 28 15:00:48 2010
@@ -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
=======================================
--- /trunk/qt4/immodule/qhelpermanager.cpp Sun Feb 28 15:00:02 2010
+++ /trunk/qt4/immodule/qhelpermanager.cpp Sun Feb 28 15:00:48 2010
@@ -30,23 +30,20 @@
SUCH DAMAGE.
*/
-
-//#include <config.h>
+#include "qhelpermanager.h"
#include <QtCore/QSocketNotifier>
-#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QTextCodec>
#include "uim/uim.h"
-#include "uim/uim-util.h"
#include "uim/uim-helper.h"
#include "uim/uim-im-switcher.h"
-
-#include "qhelpermanager.h"
-#include "quiminputcontext.h"
-#include "quiminfomanager.h"
+#include "uim/uim-util.h"
+
#include "plugin.h"
+#include "quiminfomanager.h"
+#include "quiminputcontext.h"
static int im_uim_fd = 0;
static QSocketNotifier *notifier = 0;
=======================================
--- /trunk/qt4/immodule/qhelpermanager.h Sun Feb 28 15:00:02 2010
+++ /trunk/qt4/immodule/qhelpermanager.h Sun Feb 28 15:00:48 2010
@@ -36,7 +36,6 @@
#include <QtCore/QObject>
class QString;
-class QSocketNotifier;
class QUimHelperManager : public QObject
{
=======================================
--- /trunk/qt4/immodule/qtextutil.cpp Sun Feb 28 15:00:17 2010
+++ /trunk/qt4/immodule/qtextutil.cpp Sun Feb 28 15:00:48 2010
@@ -32,25 +32,19 @@
*/
// FIXME: Support Qt4 TextEdit
-
-//#include <config.h>
+#include "qtextutil.h"
#include <cstdlib>
#include <QtGui/QApplication>
#include <QtGui/QClipboard>
#include <QtGui/QLineEdit>
-#include <QtGui/QWidget>
#ifdef ENABLE_QT4_QT3SUPPORT
# include <Qt3Support/Q3TextEdit>
#endif
-#include "uim/uim.h"
-
-#include "qtextutil.h"
#include "quiminputcontext.h"
-
QUimTextUtil::QUimTextUtil( QObject *parent )
: QObject( parent )
{
=======================================
--- /trunk/qt4/immodule/qtextutil.h Sun Feb 28 15:00:02 2010
+++ /trunk/qt4/immodule/qtextutil.h Sun Feb 28 15:00:48 2010
@@ -33,11 +33,10 @@
#ifndef UIM_QT4_IMMODULE_QTEXTUTIL_H
#define UIM_QT4_IMMODULE_QTEXTUTIL_H
-#include <QtCore/QObject>
+#include <QObject>
#include "uim/uim.h"
-
class QUimInputContext;
class QUimTextUtil : QObject
=======================================
--- /trunk/qt4/immodule/quiminfomanager.cpp Sun Feb 28 14:58:23 2010
+++ /trunk/qt4/immodule/quiminfomanager.cpp Sun Feb 28 15:00:48 2010
@@ -30,15 +30,9 @@
SUCH DAMAGE.
*/
-
-//#include <config.h>
-
-#include <QtCore/QList>
-
-#include "uim/uim.h"
-
#include "quiminfomanager.h"
+#include "uim/uim.h"
QUimInfoManager::QUimInfoManager()
{
=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp Sun Feb 28 15:00:17 2010
+++ /trunk/qt4/immodule/quiminputcontext.cpp Sun Feb 28 15:00:48 2010
@@ -31,20 +31,21 @@
SUCH DAMAGE.
*/
-
-#include <QtCore/QEvent>
+#include "quiminputcontext.h"
+
+#include <cctype>
+#include <cstring>
+
#include <QtCore/QPoint>
-#include <QtGui/QApplication>
#include <QtGui/QInputMethodEvent>
#include <QtGui/QLabel>
#include <QtGui/QTextCharFormat>
-#include <QtGui/QWidget>
-
-#include <cctype>
-#include <cstring>
+
+#include <uim/uim-helper.h>
+#include <uim/uim-im-switcher.h>
+#include <uim/uim-scm.h>
#include "debug.h"
-#include "quiminputcontext.h"
#include "quiminputcontext_compose.h"
#include "plugin.h"
#include "candidatewindow.h"
@@ -52,10 +53,6 @@
#include "qhelpermanager.h"
#include "qtextutil.h"
-#include <uim/uim.h>
-#include <uim/uim-scm.h>
-#include <uim/uim-im-switcher.h>
-
#if UIM_QT_USE_JAPANESE_KANA_KEYBOARD_HACK
#include <X11/Xlib.h>
=======================================
--- /trunk/qt4/immodule/quiminputcontext.h Sun Feb 28 15:00:02 2010
+++ /trunk/qt4/immodule/quiminputcontext.h Sun Feb 28 15:00:48 2010
@@ -35,25 +35,25 @@
#ifndef UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_H
#define UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_H
-#include <QtCore/QEvent>
-#include <QtGui/QInputContext>
-
#ifdef Q_WS_X11
#define UIM_QT_USE_JAPANESE_KANA_KEYBOARD_HACK 1
#endif
#define UIM_QT_USE_NEW_PAGE_HANDLING 1
+#include <QtGui/QInputContext>
+
#include <uim/uim.h>
#include <uim/uim-helper.h>
-#include <uim/uim-util.h>
+
+class QEvent;
class CandidateWindow;
class QUimHelperManager;
+class QUimTextUtil;
#ifdef Q_WS_X11
typedef struct _DefTree DefTree;
class Compose;
#endif
-class QUimTextUtil;
class PreeditSegment
{
=======================================
--- /trunk/qt4/immodule/quiminputcontext_compose.cpp Sun Feb 28 15:00:17
2010
+++ /trunk/qt4/immodule/quiminputcontext_compose.cpp Sun Feb 28 15:00:48
2010
@@ -29,31 +29,32 @@
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
*/
-
#include <config.h>
+#include "quiminputcontext_compose.h"
+
#include <cctype>
#include <cerrno>
#include <clocale>
#include <cstdio>
#include <cstdlib>
#include <cstring>
-#include <sys/param.h>
#include <sys/stat.h>
+#include <sys/param.h>
#ifdef HAVE_LANGINFO_CODESET
#include <langinfo.h>
#endif
-#include "uim/uim.h"
-
-#include "quiminputcontext.h"
-#include "quiminputcontext_compose.h"
-
#include <QtCore/QTextCodec>
-
-#include <X11/keysym.h>
+#include <QtGui/QKeyEvent>
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include <X11/keysym.h>
+
+#include "uim/uim.h"
+
+#include "quiminputcontext.h"
static const char COMPOSE_FILE[] = "Compose";
static const char COMPOSE_DIR_FILE[] = "X11/locale/compose.dir";
=======================================
--- /trunk/qt4/immodule/quiminputcontext_compose.h Sun Feb 28 14:58:04 2010
+++ /trunk/qt4/immodule/quiminputcontext_compose.h Sun Feb 28 15:00:48 2010
@@ -37,10 +37,16 @@
#include <X11/X.h>
#undef Above
#undef Below
+#undef CursorShape
+#undef FocusIn
+#undef FocusOut
+#undef FontChange
#undef KeyPress
#undef KeyRelease
#undef None
+class QKeyEvent;
+
typedef struct _DefTree {
struct _DefTree *next; /* another Key definition */
struct _DefTree *succession; /* successive Key Sequence */
=======================================
--- /trunk/qt4/immodule/subwindow.cpp Sun Feb 28 15:00:02 2010
+++ /trunk/qt4/immodule/subwindow.cpp Sun Feb 28 15:00:48 2010
@@ -30,19 +30,16 @@
SUCH DAMAGE.
*/
-
-//#include <config.h>
+#include "subwindow.h"
#include <QtCore/QPoint>
#include <QtCore/QRect>
-#include <QtCore/QTimer>
#include <QtGui/QApplication>
#include <QtGui/QDesktopWidget>
#include <QtGui/QLabel>
#include <QtGui/QTextBrowser>
#include <QtGui/QVBoxLayout>
-#include "subwindow.h"
const Qt::WFlags subwindowFlag = ( Qt::Window
| Qt::WindowStaysOnTopHint
