Revision: 6202
Author: nogu.dev
Date: Sun Feb 28 15:00:02 2010
Log: * qt4/immodule/candidatewindow.cpp
* qt4/immodule/debug.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/quiminputcontext.cpp
* qt4/immodule/quiminputcontext.h
* qt4/immodule/quiminputcontext_compose.cpp
* qt4/immodule/quiminputcontext_with_slave.cpp
* qt4/immodule/subwindow.cpp
* qt4/immodule/subwindow.h
- Switch to new Qt4 include syntax.
http://code.google.com/p/uim/source/detail?r=6202
Modified:
/trunk/qt4/immodule/candidatewindow.cpp
/trunk/qt4/immodule/debug.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/quiminputcontext.cpp
/trunk/qt4/immodule/quiminputcontext.h
/trunk/qt4/immodule/quiminputcontext_compose.cpp
/trunk/qt4/immodule/quiminputcontext_with_slave.cpp
/trunk/qt4/immodule/subwindow.cpp
/trunk/qt4/immodule/subwindow.h
=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp Sun Feb 28 14:58:23 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp Sun Feb 28 15:00:02 2010
@@ -33,12 +33,12 @@
//#include <config.h>
-#include <qapplication.h>
-#include <QDesktopWidget>
-#include <qlabel.h>
-#include <qfontmetrics.h>
-#include <qevent.h>
+#include <QtCore/QEvent>
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopWidget>
+#include <QtGui/QFontMetrics>
#include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
#include <QtGui/QTableWidget>
#include <QtGui/QVBoxLayout>
=======================================
--- /trunk/qt4/immodule/debug.h Tue Jan 20 18:11:15 2009
+++ /trunk/qt4/immodule/debug.h Sun Feb 28 15:00:02 2010
@@ -34,7 +34,7 @@
#ifndef UIM_QT4_IMMODULE_DEBUG_H
#define UIM_QT4_IMMODULE_DEBUG_H
-#include <QtGlobal>
+#include <QtCore/QtGlobal>
#ifdef QT_NO_DEBUG
#undef qDebug
=======================================
--- /trunk/qt4/immodule/plugin.cpp Sun Feb 28 14:59:28 2010
+++ /trunk/qt4/immodule/plugin.cpp Sun Feb 28 15:00:02 2010
@@ -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"
=======================================
--- /trunk/qt4/immodule/plugin.h Sun Feb 28 14:59:08 2010
+++ /trunk/qt4/immodule/plugin.h Sun Feb 28 15:00:02 2010
@@ -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;
=======================================
--- /trunk/qt4/immodule/qhelpermanager.cpp Sun Feb 28 14:59:28 2010
+++ /trunk/qt4/immodule/qhelpermanager.cpp Sun Feb 28 15:00:02 2010
@@ -33,10 +33,10 @@
//#include <config.h>
-#include <qsocketnotifier.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qtextcodec.h>
+#include <QtCore/QSocketNotifier>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QTextCodec>
#include "uim/uim.h"
#include "uim/uim-util.h"
=======================================
--- /trunk/qt4/immodule/qhelpermanager.h Sun Feb 28 14:58:56 2010
+++ /trunk/qt4/immodule/qhelpermanager.h Sun Feb 28 15:00:02 2010
@@ -33,7 +33,7 @@
#ifndef UIM_QT4_IMMODULE_QHELPERMANAGER_H
#define UIM_QT4_IMMODULE_QHELPERMANAGER_H
-#include <qobject.h>
+#include <QtCore/QObject>
class QString;
class QSocketNotifier;
=======================================
--- /trunk/qt4/immodule/qtextutil.cpp Sun Feb 28 14:58:23 2010
+++ /trunk/qt4/immodule/qtextutil.cpp Sun Feb 28 15:00:02 2010
@@ -37,10 +37,10 @@
#include <stdlib.h>
-#include <qwidget.h>
-#include <qlineedit.h>
-#include <qapplication.h>
-#include <qclipboard.h>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtGui/QLineEdit>
+#include <QtGui/QWidget>
#ifdef ENABLE_QT4_QT3SUPPORT
# include <Qt3Support/Q3TextEdit>
#endif
=======================================
--- /trunk/qt4/immodule/qtextutil.h Sun Feb 28 14:58:56 2010
+++ /trunk/qt4/immodule/qtextutil.h Sun Feb 28 15:00:02 2010
@@ -33,7 +33,7 @@
#ifndef UIM_QT4_IMMODULE_QTEXTUTIL_H
#define UIM_QT4_IMMODULE_QTEXTUTIL_H
-#include <QObject>
+#include <QtCore/QObject>
#include "uim/uim.h"
=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp Sun Feb 28 14:58:37 2010
+++ /trunk/qt4/immodule/quiminputcontext.cpp Sun Feb 28 15:00:02 2010
@@ -32,15 +32,13 @@
*/
-#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>
=======================================
--- /trunk/qt4/immodule/quiminputcontext.h Sun Feb 28 14:58:56 2010
+++ /trunk/qt4/immodule/quiminputcontext.h Sun Feb 28 15:00:02 2010
@@ -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
=======================================
--- /trunk/qt4/immodule/quiminputcontext_compose.cpp Sun Feb 28 14:58:37
2010
+++ /trunk/qt4/immodule/quiminputcontext_compose.cpp Sun Feb 28 15:00:02
2010
@@ -49,7 +49,7 @@
#include "quiminputcontext.h"
#include "quiminputcontext_compose.h"
-#include <qtextcodec.h>
+#include <QtCore/QTextCodec>
#include <X11/keysym.h>
#include <X11/Xlib.h>
=======================================
--- /trunk/qt4/immodule/quiminputcontext_with_slave.cpp Sun Feb 28 14:58:23
2010
+++ /trunk/qt4/immodule/quiminputcontext_with_slave.cpp Sun Feb 28 15:00:02
2010
@@ -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 )
=======================================
--- /trunk/qt4/immodule/subwindow.cpp Sun Feb 28 14:57:29 2010
+++ /trunk/qt4/immodule/subwindow.cpp Sun Feb 28 15:00:02 2010
@@ -33,13 +33,13 @@
//#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>
#include <QtGui/QVBoxLayout>
#include "subwindow.h"
=======================================
--- /trunk/qt4/immodule/subwindow.h Sun Feb 28 14:58:56 2010
+++ /trunk/qt4/immodule/subwindow.h Sun Feb 28 15:00:02 2010
@@ -33,7 +33,7 @@
#ifndef UIM_QT4_IMMODULE_SUBWINDOW_H
#define UIM_QT4_IMMODULE_SUBWINDOW_H
-#include <QTimer>
+#include <QtCore/QTimer>
#include <QtGui/QFrame>
class QLabel;
