Update to latest tqt3 automated conversion

15 files changed, 43 insertions, 43 deletions

diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
index c164af267..5e8d36cc0 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
@@ -42,11 +42,11 @@
 
 #ifndef QT_NO_IM
 #include "qmultiinputcontext.h"
-#include <qinputcontextfactory.h>
-#include <qstringlist.h>
-#include <qpopupmenu.h>
+#include <ntqinputcontextfactory.h>
+#include <ntqstringlist.h>
+#include <ntqpopupmenu.h>
 #ifndef QT_NO_IM_EXTENSIONS
-#include <qsettings.h>
+#include <ntqsettings.h>
 #endif
 
 #include <cstdlib>
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
index 7e7421ab2..2a2980d94 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
@@ -45,11 +45,11 @@
 
 #ifndef QT_NO_IM
 
-#include <qnamespace.h>
-#include <qwidget.h>
-#include <qinputcontext.h>
-#include <qguardedptr.h>
-#include <qintdict.h>
+#include <ntqnamespace.h>
+#include <ntqwidget.h>
+#include <ntqinputcontext.h>
+#include <ntqguardedptr.h>
+#include <ntqintdict.h>
 
 class TQPopupMenu;
 
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp
index cc99e12d2..08d0a1ddd 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp
@@ -43,8 +43,8 @@
 #ifndef QT_NO_IM
 #include "qmultiinputcontext.h"
 #include "qmultiinputcontextplugin.h"
-#include <qinputcontextplugin.h>
-#include <qstringlist.h>
+#include <ntqinputcontextplugin.h>
+#include <ntqstringlist.h>
 
 
 TQMultiInputContextPlugin::TQMultiInputContextPlugin()
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h
index 13b60254a..9b2039d96 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h
@@ -42,8 +42,8 @@
 
 #ifndef QT_NO_IM
 #include "qmultiinputcontext.h"
-#include <qinputcontextplugin.h>
-#include <qstringlist.h>
+#include <ntqinputcontextplugin.h>
+#include <ntqstringlist.h>
 
 
 class TQMultiInputContextPlugin : public TQInputContextPlugin
diff --git a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp
index 39bebe190..9f6014be5 100644
--- a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp
+++ b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp
@@ -42,8 +42,8 @@
 
 #ifndef QT_NO_IM
 #include "qnoneinputcontextplugin.h"
-#include <qinputcontextfactory.h>
-#include <qsettings.h>
+#include <ntqinputcontextfactory.h>
+#include <ntqsettings.h>
 #include <cstdlib>
 
 
diff --git a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h
index 37e59f8cd..a521555f0 100644
--- a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h
+++ b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h
@@ -41,8 +41,8 @@
 **********************************************************************/
 
 #ifndef QT_NO_IM
-#include <qinputcontextplugin.h>
-#include <qstringlist.h>
+#include <ntqinputcontextplugin.h>
+#include <ntqstringlist.h>
 
 
 class TQNoneInputContextPlugin : public TQInputContextPlugin
diff --git a/plugins/src/inputmethods/simple/composetable.cpp b/plugins/src/inputmethods/simple/composetable.cpp
index 2fa3e09bb..0fd2a6709 100644
--- a/plugins/src/inputmethods/simple/composetable.cpp
+++ b/plugins/src/inputmethods/simple/composetable.cpp
@@ -51,7 +51,7 @@
 
 #include "qsimpleinputcontext.h"
 
-#include <qnamespace.h>
+#include <ntqnamespace.h>
 
 static const TQComposeTableElement defaultTable[] = {
 // /* broken */    { {0x0000, 0x0000, 0, 0, 0, 0}, 0x1eda }, // U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
index 2e8398fb0..b0cb94c11 100644
--- a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
+++ b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
@@ -42,9 +42,9 @@
 
 #include "qsimpleinputcontext.h"
 
-#include <qnamespace.h>
-#include <qevent.h>
-#include <qglobal.h>
+#include <ntqnamespace.h>
+#include <ntqevent.h>
+#include <ntqglobal.h>
 #include <algorithm>
 
 static const int ignoreKeys[] = {
diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontext.h b/plugins/src/inputmethods/simple/qsimpleinputcontext.h
index f2028d8de..3eb56133f 100644
--- a/plugins/src/inputmethods/simple/qsimpleinputcontext.h
+++ b/plugins/src/inputmethods/simple/qsimpleinputcontext.h
@@ -43,8 +43,8 @@
 #ifndef TQSIMPLEINPUT_CONTEXT_H
 #define TQSIMPLEINPUT_CONTEXT_H
 
-#include <qinputcontext.h>
-#include <qnamespace.h>
+#include <ntqinputcontext.h>
+#include <ntqnamespace.h>
 
 #define QT_KEYSETQUENCE_MAX_LEN 6
 #define UNITIZE(qkey) (0x02000000|qkey)
diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp
index d98ea5a10..a7d2bb320 100644
--- a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp
+++ b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp
@@ -43,8 +43,8 @@
 #ifndef QT_NO_IM
 #include "qsimpleinputcontext.h"
 #include "qsimpleinputcontextplugin.h"
-#include <qinputcontextplugin.h>
-#include <qstringlist.h>
+#include <ntqinputcontextplugin.h>
+#include <ntqstringlist.h>
 
 
 TQSimpleInputContextPlugin::TQSimpleInputContextPlugin()
diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h
index 1f5bbb4b1..dbe7f4715 100644
--- a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h
+++ b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h
@@ -42,8 +42,8 @@
 
 #ifndef QT_NO_IM
 #include "qsimpleinputcontext.h"
-#include <qinputcontextplugin.h>
-#include <qstringlist.h>
+#include <ntqinputcontextplugin.h>
+#include <ntqstringlist.h>
 
 
 class TQSimpleInputContextPlugin : public TQInputContextPlugin
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