Update to latest tqt3 automated conversion

31 files changed, 80 insertions, 80 deletions

diff --git a/src/codecs/qbig5codec.h b/src/codecs/ntqbig5codec.h
index c32f3a63b..24b8747ec 100644
--- a/src/codecs/qbig5codec.h
+++ b/src/codecs/ntqbig5codec.h
@@ -46,7 +46,7 @@
 #define TQBIG5CODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qeucjpcodec.h b/src/codecs/ntqeucjpcodec.h
index 31154b619..b5d6e7d88 100644
--- a/src/codecs/qeucjpcodec.h
+++ b/src/codecs/ntqeucjpcodec.h
@@ -71,8 +71,8 @@
 #define TQEUCJPCODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
-#include "qjpunicode.h"
+#include "ntqtextcodec.h"
+#include "ntqjpunicode.h"
 #endif // QT_H
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qeuckrcodec.h b/src/codecs/ntqeuckrcodec.h
index 0c8371d0d..7235ca31a 100644
--- a/src/codecs/qeuckrcodec.h
+++ b/src/codecs/ntqeuckrcodec.h
@@ -67,7 +67,7 @@
 #define TQEUCKRCODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qgb18030codec.h b/src/codecs/ntqgb18030codec.h
index a0f88dd84..fa7f897c9 100644
--- a/src/codecs/qgb18030codec.h
+++ b/src/codecs/ntqgb18030codec.h
@@ -42,7 +42,7 @@
 #define TQGB18030CODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 
diff --git a/src/codecs/qgbkcodec.h b/src/codecs/ntqgbkcodec.h
index df13073d7..6701ac935 100644
--- a/src/codecs/qgbkcodec.h
+++ b/src/codecs/ntqgbkcodec.h
@@ -42,6 +42,6 @@
 #ifndef TQGBKCODEC_H
 #define TQGBKCODEC_H
 #ifndef QT_H
-#include "qgb18030codec.h"
+#include "ntqgb18030codec.h"
 #endif // QT_H
 #endif
diff --git a/src/codecs/qjiscodec.h b/src/codecs/ntqjiscodec.h
index 02dc2acf0..00cbf7cde 100644
--- a/src/codecs/qjiscodec.h
+++ b/src/codecs/ntqjiscodec.h
@@ -71,8 +71,8 @@
 #define TQJISCODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
-#include "qjpunicode.h"
+#include "ntqtextcodec.h"
+#include "ntqjpunicode.h"
 #endif // QT_H
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qjpunicode.h b/src/codecs/ntqjpunicode.h
index 15107d7c2..eb0c8f712 100644
--- a/src/codecs/qjpunicode.h
+++ b/src/codecs/ntqjpunicode.h
@@ -71,7 +71,7 @@
 #define TQJPUNICODE_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qrtlcodec.h b/src/codecs/ntqrtlcodec.h
index 1ddbbde7a..bb031da45 100644
--- a/src/codecs/qrtlcodec.h
+++ b/src/codecs/ntqrtlcodec.h
@@ -42,7 +42,7 @@
 #define TQRTLCODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 #ifndef QT_NO_CODEC_HEBREW
diff --git a/src/codecs/qsjiscodec.h b/src/codecs/ntqsjiscodec.h
index 4e85505ef..9bac66caf 100644
--- a/src/codecs/qsjiscodec.h
+++ b/src/codecs/ntqsjiscodec.h
@@ -71,8 +71,8 @@
 #define TQSJISCODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
-#include "qjpunicode.h"
+#include "ntqtextcodec.h"
+#include "ntqjpunicode.h"
 #endif // QT_H
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qtextcodec.h b/src/codecs/ntqtextcodec.h
index 5fb16c1dc..d6ea1a3bd 100644
--- a/src/codecs/qtextcodec.h
+++ b/src/codecs/ntqtextcodec.h
@@ -42,7 +42,7 @@
 #define TQTEXTCODEC_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTCODEC
diff --git a/src/codecs/qtextcodecfactory.h b/src/codecs/ntqtextcodecfactory.h
index 8e1bf38ad..94b4dddad 100644
--- a/src/codecs/qtextcodecfactory.h
+++ b/src/codecs/ntqtextcodecfactory.h
@@ -40,7 +40,7 @@
 #define TQTEXTCODECFACTORY_H
 
 #ifndef QT_H
-#include "qstringlist.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTCODEC
diff --git a/src/codecs/qtextcodecplugin.h b/src/codecs/ntqtextcodecplugin.h
index b9393a023..787941f51 100644
--- a/src/codecs/qtextcodecplugin.h
+++ b/src/codecs/ntqtextcodecplugin.h
@@ -42,8 +42,8 @@
 #define TQTEXTCODECPLUGIN_H
 
 #ifndef QT_H
-#include "qgplugin.h"
-#include "qstringlist.h"
+#include "ntqgplugin.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTCODECPLUGIN
diff --git a/src/codecs/qtsciicodec.h b/src/codecs/ntqtsciicodec.h
index abe0b3a99..4b881b135 100644
--- a/src/codecs/qtsciicodec.h
+++ b/src/codecs/ntqtsciicodec.h
@@ -69,7 +69,7 @@
 #define TQTSCIICODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 #ifndef QT_NO_CODECS
diff --git a/src/codecs/qutfcodec.h b/src/codecs/ntqutfcodec.h
index d34c27925..8955b6c2c 100644
--- a/src/codecs/qutfcodec.h
+++ b/src/codecs/ntqutfcodec.h
@@ -42,7 +42,7 @@
 #define TQUTFCODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTCODEC
diff --git a/src/codecs/qbig5codec.cpp b/src/codecs/qbig5codec.cpp
index 9fdc45fac..efb90ff39 100644
--- a/src/codecs/qbig5codec.cpp
+++ b/src/codecs/qbig5codec.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 /*!
-    \class TQBig5Codec qbig5codec.h
+    \class TQBig5Codec ntqbig5codec.h
     \ingroup i18n
 
     \brief The TQBig5Codec class provides conversion to and from the Big5 encoding.
@@ -98,7 +98,7 @@
   SUCH DAMAGE.
 */
 
-#include "qbig5codec.h"
+#include "ntqbig5codec.h"
 
 #ifndef QT_NO_BIG_CODECS
 
diff --git a/src/codecs/qeucjpcodec.cpp b/src/codecs/qeucjpcodec.cpp
index a869b9144..1b5a3c897 100644
--- a/src/codecs/qeucjpcodec.cpp
+++ b/src/codecs/qeucjpcodec.cpp
@@ -42,7 +42,7 @@
 // a.k.a. Junji Takagi, and is included in TQt with the author's permission,
 // and the grateful thanks of the Trolltech team.
 
-/*! \class TQEucJpCodec qeucjpcodec.h
+/*! \class TQEucJpCodec ntqeucjpcodec.h
     \reentrant
     \ingroup i18n
 
@@ -114,7 +114,7 @@
  * SUCH DAMAGE.
  */
 
-#include "qeucjpcodec.h"
+#include "ntqeucjpcodec.h"
 
 #ifndef QT_NO_BIG_CODECS
 
diff --git a/src/codecs/qeuckrcodec.cpp b/src/codecs/qeuckrcodec.cpp
index fc799bd84..547c00e80 100644
--- a/src/codecs/qeuckrcodec.cpp
+++ b/src/codecs/qeuckrcodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-/*! \class TQEucKrCodec qeuckrcodec.h
+/*! \class TQEucKrCodec ntqeuckrcodec.h
     \reentrant
     \ingroup i18n
 
@@ -92,7 +92,7 @@
     int heuristicNameMatch(const char* hint) const;
 */
 
-#include "qeuckrcodec.h"
+#include "ntqeuckrcodec.h"
 
 #ifndef QT_NO_BIG_CODECS
 
diff --git a/src/codecs/qfontcodecs_p.h b/src/codecs/qfontcodecs_p.h
index b78738fd8..d323fbb92 100644
--- a/src/codecs/qfontcodecs_p.h
+++ b/src/codecs/qfontcodecs_p.h
@@ -54,8 +54,8 @@
 //
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qtextcodec.h"
+#include "ntqglobal.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 
diff --git a/src/codecs/qfontjpcodec.cpp b/src/codecs/qfontjpcodec.cpp
index 8cdac2dee..365f21e0e 100644
--- a/src/codecs/qfontjpcodec.cpp
+++ b/src/codecs/qfontjpcodec.cpp
@@ -42,7 +42,7 @@
 
 #ifndef QT_NO_CODECS
 #ifndef QT_NO_BIG_CODECS
-#include "qjpunicode.h"
+#include "ntqjpunicode.h"
 
 
 // JIS X 0201
diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp
index 257cbb587..938967071 100644
--- a/src/codecs/qgb18030codec.cpp
+++ b/src/codecs/qgb18030codec.cpp
@@ -35,7 +35,7 @@
 **
 **********************************************************************/
 
-/*! \class TQGb18030Codec qgb18030codec.h
+/*! \class TQGb18030Codec ntqgb18030codec.h
   \reentrant
   \ingroup i18n
 
@@ -115,10 +115,10 @@
   SUCH DAMAGE.
 */
 
-#include "qgb18030codec.h"
+#include "ntqgb18030codec.h"
 
 #if (QT_VERSION-0 >= 0x040000)
-#error "move obsolete header <qgbkcodec.h> into the src/compat directory"
+#error "move obsolete header <ntqgbkcodec.h> into the src/compat directory"
 #endif
 
 #ifndef QT_NO_BIG_CODECS
diff --git a/src/codecs/qisciicodec_p.h b/src/codecs/qisciicodec_p.h
index 6f2f43edb..ebf9fe14b 100644
--- a/src/codecs/qisciicodec_p.h
+++ b/src/codecs/qisciicodec_p.h
@@ -2,7 +2,7 @@
 #define TQISCIICODEC_H
 
 #ifndef QT_H
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif // QT_H
 
 #ifndef QT_NO_CODECS
diff --git a/src/codecs/qjiscodec.cpp b/src/codecs/qjiscodec.cpp
index f0ecfdb65..5f5afbb9b 100644
--- a/src/codecs/qjiscodec.cpp
+++ b/src/codecs/qjiscodec.cpp
@@ -132,7 +132,7 @@
   SUCH DAMAGE.
 */
 
-#include "qjiscodec.h"
+#include "ntqjiscodec.h"
 
 #ifndef QT_NO_BIG_CODECS
 
diff --git a/src/codecs/qjpunicode.cpp b/src/codecs/qjpunicode.cpp
index bc2d19328..1a6c34aea 100644
--- a/src/codecs/qjpunicode.cpp
+++ b/src/codecs/qjpunicode.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-/*! \class TQJpUnicodeConv qjpunicode.h
+/*! \class TQJpUnicodeConv ntqjpunicode.h
     \reentrant
     \ingroup i18n
 
@@ -82,9 +82,9 @@
   SUCH DAMAGE.
 */
 
-#include "qjpunicode.h"
+#include "ntqjpunicode.h"
 #ifndef QT_NO_BIG_CODECS
-#include "qcstring.h"
+#include "ntqcstring.h"
 #ifdef Q_OS_TEMP
 #include "qwinfunctions_wce.h"
 #endif
diff --git a/src/codecs/qrtlcodec.cpp b/src/codecs/qrtlcodec.cpp
index 75a049c7e..fa1585ec8 100644
--- a/src/codecs/qrtlcodec.cpp
+++ b/src/codecs/qrtlcodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qrtlcodec.h"
+#include "ntqrtlcodec.h"
 #include <private/qtextengine_p.h>
 
 #ifndef QT_NO_CODEC_HEBREW
@@ -359,7 +359,7 @@ static TQChar::Direction findBasicDirection(TQString str)
 
 
 /*!
-    \class TQHebrewCodec qrtlcodec.h
+    \class TQHebrewCodec ntqrtlcodec.h
     \reentrant
     \ingroup i18n
 
diff --git a/src/codecs/qsjiscodec.cpp b/src/codecs/qsjiscodec.cpp
index e6666a02b..9d2df5109 100644
--- a/src/codecs/qsjiscodec.cpp
+++ b/src/codecs/qsjiscodec.cpp
@@ -42,7 +42,7 @@
 // a.k.a. Junji Takagi, and is included in TQt with the author's permission,
 // and the grateful thanks of the Trolltech team.
 
-/*! \class TQSjisCodec qsjiscodec.h
+/*! \class TQSjisCodec ntqsjiscodec.h
     \reentrant
     \ingroup i18n
   \brief The TQSjisCodec class provides conversion to and from Shift-JIS.
@@ -90,7 +90,7 @@
   SUCH DAMAGE.
 */
 
-#include "qsjiscodec.h"
+#include "ntqsjiscodec.h"
 
 #ifndef QT_NO_BIG_CODECS
 
diff --git a/src/codecs/qt_codecs.pri b/src/codecs/qt_codecs.pri
index 344557299..3753a5dae 100644
--- a/src/codecs/qt_codecs.pri
+++ b/src/codecs/qt_codecs.pri
@@ -5,21 +5,21 @@ tools {
 	CODECS_P		= codecs
 	HEADERS += \
 #$$CODECS_H/qasmocodec.h \
-		$$CODECS_H/qbig5codec.h \
-		  $$CODECS_H/qeucjpcodec.h \
-		  $$CODECS_H/qeuckrcodec.h \
+		$$CODECS_H/ntqbig5codec.h \
+		  $$CODECS_H/ntqeucjpcodec.h \
+		  $$CODECS_H/ntqeuckrcodec.h \
 		  $$CODECS_P/qisciicodec_p.h \
-		  $$CODECS_H/qgb18030codec.h \
-		  $$CODECS_H/qjiscodec.h \
-		  $$CODECS_H/qjpunicode.h \
-		  $$CODECS_H/qrtlcodec.h \
-		  $$CODECS_H/qsjiscodec.h \
-		  $$CODECS_H/qtextcodec.h \
-		  $$CODECS_H/qtsciicodec.h \
-		  $$CODECS_H/qutfcodec.h \
+		  $$CODECS_H/ntqgb18030codec.h \
+		  $$CODECS_H/ntqjiscodec.h \
+		  $$CODECS_H/ntqjpunicode.h \
+		  $$CODECS_H/ntqrtlcodec.h \
+		  $$CODECS_H/ntqsjiscodec.h \
+		  $$CODECS_H/ntqtextcodec.h \
+		  $$CODECS_H/ntqtsciicodec.h \
+		  $$CODECS_H/ntqutfcodec.h \
 		  $$CODECS_P/qtextcodecinterface_p.h \
-		  $$CODECS_H/qtextcodecfactory.h \
-		  $$CODECS_H/qtextcodecplugin.h
+		  $$CODECS_H/ntqtextcodecfactory.h \
+		  $$CODECS_H/ntqtextcodecplugin.h
 
 	SOURCES += \
 #$$CODECS_CPP/qasmocodec.cpp \
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp
index c08d465fa..23b6ff51a 100644
--- a/src/codecs/qtextcodec.cpp
+++ b/src/codecs/qtextcodec.cpp
@@ -45,30 +45,30 @@
 # undef open
 #endif
 
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #ifndef QT_NO_TEXTCODEC
 
-#include "qvaluelist.h"
-#include "qtextcodecfactory.h"
-#include "qutfcodec.h"
-#include "qnamespace.h"
+#include "ntqvaluelist.h"
+#include "ntqtextcodecfactory.h"
+#include "ntqutfcodec.h"
+#include "ntqnamespace.h"
 #ifndef QT_NO_CODECS
-#include "qrtlcodec.h"
-#include "qtsciicodec.h"
+#include "ntqrtlcodec.h"
+#include "ntqtsciicodec.h"
 #include "qisciicodec_p.h"
 #endif // QT_NO_CODECS
 #ifndef QT_NO_BIG_CODECS
-#include "qbig5codec.h"
-#include "qeucjpcodec.h"
-#include "qeuckrcodec.h"
-#include "qgb18030codec.h"
-#include "qjiscodec.h"
-#include "qjpunicode.h"
-#include "qsjiscodec.h"
+#include "ntqbig5codec.h"
+#include "ntqeucjpcodec.h"
+#include "ntqeuckrcodec.h"
+#include "ntqgb18030codec.h"
+#include "ntqjiscodec.h"
+#include "ntqjpunicode.h"
+#include "ntqsjiscodec.h"
 #endif // QT_NO_BIG_CODECS
-#include "qfile.h"
-#include "qstrlist.h"
-#include "qstring.h"
+#include "ntqfile.h"
+#include "ntqstrlist.h"
+#include "ntqstring.h"
 #include "../tools/qlocale_p.h"
 
 #if !defined(QT_NO_CODECS) && !defined(QT_NO_BIG_CODECS) && defined(Q_WS_X11)
@@ -202,7 +202,7 @@ TQString TQTextStatelessDecoder::toUnicode(const char* chars, int len)
 
 
 /*!
-    \class TQTextCodec qtextcodec.h
+    \class TQTextCodec ntqtextcodec.h
     \brief The TQTextCodec class provides conversion between text encodings.
     \reentrant
     \ingroup i18n
@@ -1160,7 +1160,7 @@ bool TQTextCodec::canEncode( const TQString& s ) const
 
 
 /*!
-    \class TQTextEncoder qtextcodec.h
+    \class TQTextEncoder ntqtextcodec.h
     \brief The TQTextEncoder class provides a state-based encoder.
     \reentrant
     \ingroup i18n
@@ -1192,7 +1192,7 @@ TQTextEncoder::~TQTextEncoder()
 */
 
 /*!
-    \class TQTextDecoder qtextcodec.h
+    \class TQTextDecoder ntqtextcodec.h
     \brief The TQTextDecoder class provides a state-based decoder.
     \reentrant
     \ingroup i18n
diff --git a/src/codecs/qtextcodecfactory.cpp b/src/codecs/qtextcodecfactory.cpp
index a0ccedbcd..71e5ed125 100644
--- a/src/codecs/qtextcodecfactory.cpp
+++ b/src/codecs/qtextcodecfactory.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qtextcodecfactory.h"
+#include "ntqtextcodecfactory.h"
 
 #ifndef QT_NO_TEXTCODEC
 
 #ifndef QT_NO_COMPONENT
-#include "qapplication.h"
-#include "qcleanuphandler.h"
+#include "ntqapplication.h"
+#include "ntqcleanuphandler.h"
 #include <private/qpluginmanager_p.h>
 #include "qtextcodecinterface_p.h"
 
diff --git a/src/codecs/qtextcodecplugin.cpp b/src/codecs/qtextcodecplugin.cpp
index 29264c9dd..6f084584d 100644
--- a/src/codecs/qtextcodecplugin.cpp
+++ b/src/codecs/qtextcodecplugin.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qtextcodecplugin.h"
+#include "ntqtextcodecplugin.h"
 #ifndef QT_NO_TEXTCODECPLUGIN
 #include "qtextcodecinterface_p.h"
 
 /*!
-    \class TQTextCodecPlugin qtextcodecplugin.h
+    \class TQTextCodecPlugin ntqtextcodecplugin.h
     \brief The TQTextCodecPlugin class provides an abstract base for custom TQTextCodec plugins.
     \reentrant
     \ingroup plugins
diff --git a/src/codecs/qtsciicodec.cpp b/src/codecs/qtsciicodec.cpp
index 5d6825272..87fc18b3f 100644
--- a/src/codecs/qtsciicodec.cpp
+++ b/src/codecs/qtsciicodec.cpp
@@ -40,7 +40,7 @@
 // and is included in TQt with the author's permission, and the grateful
 // thanks of the Trolltech team.
 
-/*! \class TQTsciiCodec qtsciicodec.h
+/*! \class TQTsciiCodec ntqtsciicodec.h
     \reentrant
     \ingroup i18n
 
@@ -92,7 +92,7 @@
   SUCH DAMAGE.
 */
 
-#include "qtsciicodec.h"
+#include "ntqtsciicodec.h"
 
 #ifndef QT_NO_CODECS
 
diff --git a/src/codecs/qutfcodec.cpp b/src/codecs/qutfcodec.cpp
index a95663614..4943ac8c2 100644
--- a/src/codecs/qutfcodec.cpp
+++ b/src/codecs/qutfcodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qutfcodec.h"
+#include "ntqutfcodec.h"
 
 #ifndef QT_NO_TEXTCODEC