summaryrefslogtreecommitdiffstats
path: root/plugins/src/inputmethods/xim
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-26 23:32:43 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-26 23:32:43 -0600
commitea318d1431c89e647598c510c4245c6571aa5f46 (patch)
tree996d29b80c30d453dda86d1a23162d441628f169 /plugins/src/inputmethods/xim
parentaaf89d4b48f69c9293feb187db26362e550b5561 (diff)
downloadtqt3-ea318d1431c89e647598c510c4245c6571aa5f46.tar.gz
tqt3-ea318d1431c89e647598c510c4245c6571aa5f46.zip
Update to latest tqt3 automated conversion
Diffstat (limited to 'plugins/src/inputmethods/xim')
-rw-r--r--plugins/src/inputmethods/xim/qximinputcontext.h12
-rw-r--r--plugins/src/inputmethods/xim/qximinputcontext_x11.cpp12
-rw-r--r--plugins/src/inputmethods/xim/qximinputcontextplugin.cpp4
-rw-r--r--plugins/src/inputmethods/xim/qximinputcontextplugin.h4
4 files changed, 16 insertions, 16 deletions
diff --git a/plugins/src/inputmethods/xim/qximinputcontext.h b/plugins/src/inputmethods/xim/qximinputcontext.h
index 96afee5eb..70499de36 100644
--- a/plugins/src/inputmethods/xim/qximinputcontext.h
+++ b/plugins/src/inputmethods/xim/qximinputcontext.h
@@ -51,10 +51,10 @@
#if !defined(Q_NO_IM)
-#include "qglobal.h"
-#include <qinputcontext.h>
-#include <qfont.h>
-#include <qcstring.h>
+#include "ntqglobal.h"
+#include <ntqinputcontext.h>
+#include <ntqfont.h>
+#include <ntqcstring.h>
class TQKeyEvent;
class TQWidget;
@@ -63,8 +63,8 @@ class TQString;
#ifdef Q_WS_X11
-#include "qarray.h"
-#include "qwindowdefs.h"
+#include "ntqarray.h"
+#include "ntqwindowdefs.h"
#include <private/qt_x11_p.h>
#endif
diff --git a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
index b1f460b42..43328071b 100644
--- a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
+++ b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
@@ -45,12 +45,12 @@ const int XKeyRelease = KeyRelease;
#include "qplatformdefs.h"
-#include "qapplication.h"
-#include "qwidget.h"
-#include "qstring.h"
-#include "qptrlist.h"
-#include "qintdict.h"
-#include "qtextcodec.h"
+#include "ntqapplication.h"
+#include "ntqwidget.h"
+#include "ntqstring.h"
+#include "ntqptrlist.h"
+#include "ntqintdict.h"
+#include "ntqtextcodec.h"
#include <stdlib.h>
#include <limits.h>
diff --git a/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp b/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp
index 1b1fa270f..381b808a8 100644
--- a/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp
+++ b/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp
@@ -43,8 +43,8 @@
#ifndef QT_NO_IM
#include "qximinputcontext.h"
#include "qximinputcontextplugin.h"
-#include <qinputcontextplugin.h>
-#include <qstringlist.h>
+#include <ntqinputcontextplugin.h>
+#include <ntqstringlist.h>
TQXIMInputContextPlugin::TQXIMInputContextPlugin()
diff --git a/plugins/src/inputmethods/xim/qximinputcontextplugin.h b/plugins/src/inputmethods/xim/qximinputcontextplugin.h
index 6d566190f..d58d5d53b 100644
--- a/plugins/src/inputmethods/xim/qximinputcontextplugin.h
+++ b/plugins/src/inputmethods/xim/qximinputcontextplugin.h
@@ -42,8 +42,8 @@
#ifndef QT_NO_IM
#include "qximinputcontext.h"
-#include <qinputcontextplugin.h>
-#include <qstringlist.h>
+#include <ntqinputcontextplugin.h>
+#include <ntqstringlist.h>
class TQXIMInputContextPlugin : public TQInputContextPlugin