37 files changed, 109 insertions, 112 deletions
diff --git a/src/codecs/qt_codecs.pri b/src/codecs/qt_codecs.pri
deleted file mode 100644
index 80ec0c22f..000000000
--- a/src/codecs/qt_codecs.pri
+++ /dev/null
@@ -1,48 +0,0 @@
-# TQt codecs module
-
-!bigcodecs:DEFINES += TQT_NO_BIG_CODECS
-tools {
-	CODECS_P		= codecs
-	HEADERS += \
-#$$CODECS_H/qasmocodec.h \
-		$$CODECS_H/ntqbig5codec.h \
-		  $$CODECS_H/ntqeucjpcodec.h \
-		  $$CODECS_H/ntqeuckrcodec.h \
-		  $$CODECS_P/qisciicodec_p.h \
-		  $$CODECS_H/ntqgb18030codec.h \
-		  $$CODECS_H/ntqjiscodec.h \
-		  $$CODECS_H/ntqjpunicode.h \
-		  $$CODECS_H/ntqrtlcodec.h \
-		  $$CODECS_H/ntqsjiscodec.h \
-		  $$CODECS_H/tqtextcodec.h \
-		  $$CODECS_H/ntqtsciicodec.h \
-		  $$CODECS_H/ntqutfcodec.h \
-		  $$CODECS_P/tqtextcodecinterface_p.h \
-		  $$CODECS_H/tqtextcodecfactory.h \
-		  $$CODECS_H/tqtextcodecplugin.h
-
-	SOURCES += \
-#$$CODECS_CPP/qasmocodec.cpp \
-		$$CODECS_CPP/qbig5codec.cpp \
-		  $$CODECS_CPP/qeucjpcodec.cpp \
-		  $$CODECS_CPP/qeuckrcodec.cpp \
-		  $$CODECS_CPP/qisciicodec.cpp \
-		  $$CODECS_CPP/qgb18030codec.cpp \
-		  $$CODECS_CPP/qjiscodec.cpp \
-		  $$CODECS_CPP/qjpunicode.cpp \
-		  $$CODECS_CPP/qrtlcodec.cpp \
-		  $$CODECS_CPP/qsjiscodec.cpp \
-		  $$CODECS_CPP/tqtextcodec.cpp \
-		  $$CODECS_CPP/qtsciicodec.cpp \
-		  $$CODECS_CPP/qutfcodec.cpp \
-		  $$CODECS_CPP/tqtextcodecfactory.cpp \
-		  $$CODECS_CPP/tqtextcodecplugin.cpp
-
-	x11:SOURCES += $$CODECS_CPP/qfontcncodec.cpp  \
-	               $$CODECS_CPP/qfonthkcodec.cpp  \
-	               $$CODECS_CPP/qfontjpcodec.cpp  \
-		       $$CODECS_CPP/qfontkrcodec.cpp  \
-		       $$CODECS_CPP/qfontlaocodec.cpp \
-		       $$CODECS_CPP/qfonttwcodec.cpp
-	x11:HEADERS += $$CODECS_P/qfontcodecs_p.h
-}
diff --git a/src/codecs/qbig5codec.cpp b/src/codecs/tqbig5codec.cpp
index efeb5415b..5184973d2 100644
--- a/src/codecs/qbig5codec.cpp
+++ b/src/codecs/tqbig5codec.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 /*!
-    \class TQBig5Codec ntqbig5codec.h
+    \class TQBig5Codec tqbig5codec.h
     \ingroup i18n
 
     \brief The TQBig5Codec class provides conversion to and from the Big5 encoding.
@@ -98,7 +98,7 @@
   SUCH DAMAGE.
 */
 
-#include "ntqbig5codec.h"
+#include "tqbig5codec.h"
 
 #ifndef TQT_NO_BIG_CODECS
 
diff --git a/src/codecs/ntqbig5codec.h b/src/codecs/tqbig5codec.h
index d2f1f7c84..d2f1f7c84 100644
--- a/src/codecs/ntqbig5codec.h
+++ b/src/codecs/tqbig5codec.h
diff --git a/src/codecs/qeucjpcodec.cpp b/src/codecs/tqeucjpcodec.cpp
index 226becf04..6d75e2161 100644
--- a/src/codecs/qeucjpcodec.cpp
+++ b/src/codecs/tqeucjpcodec.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 ntqeucjpcodec.h
+/*! \class TQEucJpCodec tqeucjpcodec.h
     \reentrant
     \ingroup i18n
 
@@ -114,7 +114,7 @@
  * SUCH DAMAGE.
  */
 
-#include "ntqeucjpcodec.h"
+#include "tqeucjpcodec.h"
 
 #ifndef TQT_NO_BIG_CODECS
 
diff --git a/src/codecs/ntqeucjpcodec.h b/src/codecs/tqeucjpcodec.h
index 39b768665..c232390fe 100644
--- a/src/codecs/ntqeucjpcodec.h
+++ b/src/codecs/tqeucjpcodec.h
@@ -72,7 +72,7 @@
 
 #ifndef QT_H
 #include "tqtextcodec.h"
-#include "ntqjpunicode.h"
+#include "tqjpunicode.h"
 #endif // QT_H
 
 #ifndef TQT_NO_BIG_CODECS
diff --git a/src/codecs/qeuckrcodec.cpp b/src/codecs/tqeuckrcodec.cpp
index 44e7779c8..bba2c8808 100644
--- a/src/codecs/qeuckrcodec.cpp
+++ b/src/codecs/tqeuckrcodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-/*! \class TQEucKrCodec ntqeuckrcodec.h
+/*! \class TQEucKrCodec tqeuckrcodec.h
     \reentrant
     \ingroup i18n
 
@@ -92,7 +92,7 @@
     int heuristicNameMatch(const char* hint) const;
 */
 
-#include "ntqeuckrcodec.h"
+#include "tqeuckrcodec.h"
 
 #ifndef TQT_NO_BIG_CODECS
 
diff --git a/src/codecs/ntqeuckrcodec.h b/src/codecs/tqeuckrcodec.h
index 513c85f0b..513c85f0b 100644
--- a/src/codecs/ntqeuckrcodec.h
+++ b/src/codecs/tqeuckrcodec.h
diff --git a/src/codecs/qfontcncodec.cpp b/src/codecs/tqfontcncodec.cpp
index e628dd856..36ffc4e54 100644
--- a/src/codecs/qfontcncodec.cpp
+++ b/src/codecs/tqfontcncodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "private/qfontcodecs_p.h"
+#include "private/tqfontcodecs_p.h"
 
 #ifndef TQT_NO_CODECS
 #ifndef TQT_NO_BIG_CODECS
diff --git a/src/codecs/qfontcodecs_p.h b/src/codecs/tqfontcodecs_p.h
index b9ba7ebd4..4a8c1c602 100644
--- a/src/codecs/qfontcodecs_p.h
+++ b/src/codecs/tqfontcodecs_p.h
@@ -46,12 +46,9 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qfontencodings_x11.cpp and qfont_x11.cpp.  This header file may
+// of tqfontencodings_x11.cpp and tqfont_x11.cpp.  This header file may
 // change from version to version without notice, or even be removed.
 //
-// We mean it.
-//
-//
 
 #ifndef QT_H
 #include "ntqglobal.h"
diff --git a/src/codecs/qfonthkcodec.cpp b/src/codecs/tqfonthkcodec.cpp
index 98fad1dcd..a56d646e1 100644
--- a/src/codecs/qfonthkcodec.cpp
+++ b/src/codecs/tqfonthkcodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "private/qfontcodecs_p.h"
+#include "private/tqfontcodecs_p.h"
 
 #ifndef TQT_NO_CODECS
 #ifndef TQT_NO_BIG_CODECS
diff --git a/src/codecs/qfontjpcodec.cpp b/src/codecs/tqfontjpcodec.cpp
index 92c4fe6d9..f910d8b16 100644
--- a/src/codecs/qfontjpcodec.cpp
+++ b/src/codecs/tqfontjpcodec.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "private/qfontcodecs_p.h"
+#include "private/tqfontcodecs_p.h"
 
 #ifndef TQT_NO_CODECS
 #ifndef TQT_NO_BIG_CODECS
-#include "ntqjpunicode.h"
+#include "tqjpunicode.h"
 
 
 // JIS X 0201
diff --git a/src/codecs/qfontkrcodec.cpp b/src/codecs/tqfontkrcodec.cpp
index f7dc7f9f8..292130583 100644
--- a/src/codecs/qfontkrcodec.cpp
+++ b/src/codecs/tqfontkrcodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "private/qfontcodecs_p.h"
+#include "private/tqfontcodecs_p.h"
 
 #ifndef TQT_NO_CODECS
 #ifndef TQT_NO_BIG_CODECS
diff --git a/src/codecs/qfontlaocodec.cpp b/src/codecs/tqfontlaocodec.cpp
index 53da705f9..14adc17ed 100644
--- a/src/codecs/qfontlaocodec.cpp
+++ b/src/codecs/tqfontlaocodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "private/qfontcodecs_p.h"
+#include "private/tqfontcodecs_p.h"
 
 #ifndef TQT_NO_CODECS
 #ifndef TQT_NO_BIG_CODECS
diff --git a/src/codecs/qfonttwcodec.cpp b/src/codecs/tqfonttwcodec.cpp
index 39cc5dd45..7abff2bd6 100644
--- a/src/codecs/qfonttwcodec.cpp
+++ b/src/codecs/tqfonttwcodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "private/qfontcodecs_p.h"
+#include "private/tqfontcodecs_p.h"
 
 #ifndef TQT_NO_CODECS
 #ifndef TQT_NO_BIG_CODECS
diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/tqgb18030codec.cpp
index 5c282998a..0ae2fb4ff 100644
--- a/src/codecs/qgb18030codec.cpp
+++ b/src/codecs/tqgb18030codec.cpp
@@ -35,7 +35,7 @@
 **
 **********************************************************************/
 
-/*! \class TQGb18030Codec ntqgb18030codec.h
+/*! \class TQGb18030Codec tqgb18030codec.h
   \reentrant
   \ingroup i18n
 
@@ -81,7 +81,7 @@
   while merging contributions from James Su, Justin Yu and Sean Chen.
   A copy of the source Perl script is available at:
 
-      \l{http://people.debian.org/~foka/gb18030/gen-qgb18030codec.pl}
+      \l{http://people.debian.org/~foka/gb18030/gen-tqgb18030codec.pl}
 
   The copyright notice for their code follows:
 
@@ -115,7 +115,7 @@
   SUCH DAMAGE.
 */
 
-#include "ntqgb18030codec.h"
+#include "tqgb18030codec.h"
 
 #ifndef TQT_NO_BIG_CODECS
 
diff --git a/src/codecs/ntqgb18030codec.h b/src/codecs/tqgb18030codec.h
index c28c6222d..c28c6222d 100644
--- a/src/codecs/ntqgb18030codec.h
+++ b/src/codecs/tqgb18030codec.h
diff --git a/src/codecs/ntqgbkcodec.h b/src/codecs/tqgbkcodec.h
index 6701ac935..0a5eb6503 100644
--- a/src/codecs/ntqgbkcodec.h
+++ b/src/codecs/tqgbkcodec.h
@@ -42,6 +42,6 @@
 #ifndef TQGBKCODEC_H
 #define TQGBKCODEC_H
 #ifndef QT_H
-#include "ntqgb18030codec.h"
+#include "tqgb18030codec.h"
 #endif // QT_H
 #endif
diff --git a/src/codecs/qrtlcodec.cpp b/src/codecs/tqhebrewcodec.cpp
index de377f538..0140117b0 100644
--- a/src/codecs/qrtlcodec.cpp
+++ b/src/codecs/tqhebrewcodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqrtlcodec.h"
+#include "tqhebrewcodec.h"
 #include <private/tqtextengine_p.h>
 
 #ifndef TQT_NO_CODEC_HEBREW
@@ -359,7 +359,7 @@ static TQChar::Direction findBasicDirection(TQString str)
 
 
 /*!
-    \class TQHebrewCodec ntqrtlcodec.h
+    \class TQHebrewCodec tqhebrewcodec.h
     \reentrant
     \ingroup i18n
 
diff --git a/src/codecs/ntqrtlcodec.h b/src/codecs/tqhebrewcodec.h
index bbd990df6..065ec2e83 100644
--- a/src/codecs/ntqrtlcodec.h
+++ b/src/codecs/tqhebrewcodec.h
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#ifndef TQRTLCODEC_H
-#define TQRTLCODEC_H
+#ifndef TQHEBREWCODEC_H
+#define TQHEBREWCODEC_H
 
 #ifndef QT_H
 #include "tqtextcodec.h"
diff --git a/src/codecs/qisciicodec.cpp b/src/codecs/tqisciicodec.cpp
index 952abddb2..75d3db3e7 100644
--- a/src/codecs/qisciicodec.cpp
+++ b/src/codecs/tqisciicodec.cpp
@@ -1,4 +1,4 @@
-#include "qisciicodec_p.h"
+#include "tqisciicodec_p.h"
 #ifndef TQT_NO_CODECS
 
 #define	TQValidChar(u)	   ((u) ? TQChar((u)) : TQChar::replacement)
diff --git a/src/codecs/qisciicodec_p.h b/src/codecs/tqisciicodec_p.h
index 372415cf1..372415cf1 100644
--- a/src/codecs/qisciicodec_p.h
+++ b/src/codecs/tqisciicodec_p.h
diff --git a/src/codecs/qjiscodec.cpp b/src/codecs/tqjiscodec.cpp
index 8922209c7..beb5863c3 100644
--- a/src/codecs/qjiscodec.cpp
+++ b/src/codecs/tqjiscodec.cpp
@@ -132,7 +132,7 @@
   SUCH DAMAGE.
 */
 
-#include "ntqjiscodec.h"
+#include "tqjiscodec.h"
 
 #ifndef TQT_NO_BIG_CODECS
 
diff --git a/src/codecs/ntqjiscodec.h b/src/codecs/tqjiscodec.h
index 3e914f489..001554ce9 100644
--- a/src/codecs/ntqjiscodec.h
+++ b/src/codecs/tqjiscodec.h
@@ -72,7 +72,7 @@
 
 #ifndef QT_H
 #include "tqtextcodec.h"
-#include "ntqjpunicode.h"
+#include "tqjpunicode.h"
 #endif // QT_H
 
 #ifndef TQT_NO_BIG_CODECS
diff --git a/src/codecs/qjpunicode.cpp b/src/codecs/tqjpunicode.cpp
index aa2812498..ee03a4ff5 100644
--- a/src/codecs/qjpunicode.cpp
+++ b/src/codecs/tqjpunicode.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-/*! \class TQJpUnicodeConv ntqjpunicode.h
+/*! \class TQJpUnicodeConv tqjpunicode.h
     \reentrant
     \ingroup i18n
 
@@ -82,7 +82,7 @@
   SUCH DAMAGE.
 */
 
-#include "ntqjpunicode.h"
+#include "tqjpunicode.h"
 #ifndef TQT_NO_BIG_CODECS
 #include "ntqcstring.h"
 #ifdef Q_OS_TEMP
diff --git a/src/codecs/ntqjpunicode.h b/src/codecs/tqjpunicode.h
index 2daa893b7..2daa893b7 100644
--- a/src/codecs/ntqjpunicode.h
+++ b/src/codecs/tqjpunicode.h
diff --git a/src/codecs/qsjiscodec.cpp b/src/codecs/tqsjiscodec.cpp
index 731e2bef5..6262604e3 100644
--- a/src/codecs/qsjiscodec.cpp
+++ b/src/codecs/tqsjiscodec.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 ntqsjiscodec.h
+/*! \class TQSjisCodec tqsjiscodec.h
     \reentrant
     \ingroup i18n
   \brief The TQSjisCodec class provides conversion to and from Shift-JIS.
@@ -90,7 +90,7 @@
   SUCH DAMAGE.
 */
 
-#include "ntqsjiscodec.h"
+#include "tqsjiscodec.h"
 
 #ifndef TQT_NO_BIG_CODECS
 
diff --git a/src/codecs/ntqsjiscodec.h b/src/codecs/tqsjiscodec.h
index 8a5f83aae..ae9315973 100644
--- a/src/codecs/ntqsjiscodec.h
+++ b/src/codecs/tqsjiscodec.h
@@ -72,7 +72,7 @@
 
 #ifndef QT_H
 #include "tqtextcodec.h"
-#include "ntqjpunicode.h"
+#include "tqjpunicode.h"
 #endif // QT_H
 
 #ifndef TQT_NO_BIG_CODECS
diff --git a/src/codecs/tqt_codecs.pri b/src/codecs/tqt_codecs.pri
new file mode 100644
index 000000000..d6ff8f29f
--- /dev/null
+++ b/src/codecs/tqt_codecs.pri
@@ -0,0 +1,48 @@
+# TQt codecs module
+
+!bigcodecs:DEFINES += TQT_NO_BIG_CODECS
+tools {
+	CODECS_P		= codecs
+	HEADERS += \
+#$$CODECS_H/qasmocodec.h \
+		$$CODECS_H/tqbig5codec.h \
+		  $$CODECS_H/tqeucjpcodec.h \
+		  $$CODECS_H/tqeuckrcodec.h \
+		  $$CODECS_P/tqisciicodec_p.h \
+		  $$CODECS_H/tqgb18030codec.h \
+		  $$CODECS_H/tqjiscodec.h \
+		  $$CODECS_H/tqjpunicode.h \
+		  $$CODECS_H/tqhebrewcodec.h \
+		  $$CODECS_H/tqsjiscodec.h \
+		  $$CODECS_H/tqtextcodec.h \
+		  $$CODECS_H/tqtsciicodec.h \
+		  $$CODECS_H/tqutfcodec.h \
+		  $$CODECS_P/tqtextcodecinterface_p.h \
+		  $$CODECS_H/tqtextcodecfactory.h \
+		  $$CODECS_H/tqtextcodecplugin.h
+
+	SOURCES += \
+#$$CODECS_CPP/qasmocodec.cpp \
+		$$CODECS_CPP/tqbig5codec.cpp \
+		  $$CODECS_CPP/tqeucjpcodec.cpp \
+		  $$CODECS_CPP/tqeuckrcodec.cpp \
+		  $$CODECS_CPP/tqisciicodec.cpp \
+		  $$CODECS_CPP/tqgb18030codec.cpp \
+		  $$CODECS_CPP/tqhebrewcodec.cpp \
+		  $$CODECS_CPP/tqjiscodec.cpp \
+		  $$CODECS_CPP/tqjpunicode.cpp \
+		  $$CODECS_CPP/tqsjiscodec.cpp \
+		  $$CODECS_CPP/tqtextcodec.cpp \
+		  $$CODECS_CPP/tqtsciicodec.cpp \
+		  $$CODECS_CPP/tqutfcodec.cpp \
+		  $$CODECS_CPP/tqtextcodecfactory.cpp \
+		  $$CODECS_CPP/tqtextcodecplugin.cpp
+
+	x11:SOURCES += $$CODECS_CPP/tqfontcncodec.cpp  \
+		  $$CODECS_CPP/tqfonthkcodec.cpp  \
+		  $$CODECS_CPP/tqfontjpcodec.cpp  \
+		  $$CODECS_CPP/tqfontkrcodec.cpp  \
+		  $$CODECS_CPP/tqfontlaocodec.cpp \
+		  $$CODECS_CPP/tqfonttwcodec.cpp
+	x11:HEADERS += $$CODECS_P/tqfontcodecs_p.h
+}
diff --git a/src/codecs/tqtextcodec.cpp b/src/codecs/tqtextcodec.cpp
index 8d2c0bb17..8a4bacc8c 100644
--- a/src/codecs/tqtextcodec.cpp
+++ b/src/codecs/tqtextcodec.cpp
@@ -50,21 +50,21 @@
 
 #include "tqvaluelist.h"
 #include "tqtextcodecfactory.h"
-#include "ntqutfcodec.h"
+#include "tqutfcodec.h"
 #include "ntqnamespace.h"
 #ifndef TQT_NO_CODECS
-#include "ntqrtlcodec.h"
-#include "ntqtsciicodec.h"
-#include "qisciicodec_p.h"
+#include "tqhebrewcodec.h"
+#include "tqtsciicodec.h"
+#include "tqisciicodec_p.h"
 #endif // TQT_NO_CODECS
 #ifndef TQT_NO_BIG_CODECS
-#include "ntqbig5codec.h"
-#include "ntqeucjpcodec.h"
-#include "ntqeuckrcodec.h"
-#include "ntqgb18030codec.h"
-#include "ntqjiscodec.h"
-#include "ntqjpunicode.h"
-#include "ntqsjiscodec.h"
+#include "tqbig5codec.h"
+#include "tqeucjpcodec.h"
+#include "tqeuckrcodec.h"
+#include "tqgb18030codec.h"
+#include "tqjiscodec.h"
+#include "tqjpunicode.h"
+#include "tqsjiscodec.h"
 #endif // TQT_NO_BIG_CODECS
 #include "ntqfile.h"
 #include "tqstrlist.h"
@@ -72,7 +72,7 @@
 #include "../tools/qlocale_p.h"
 
 #if !defined(TQT_NO_CODECS) && !defined(TQT_NO_BIG_CODECS) && defined(TQ_WS_X11)
-#  include "qfontcodecs_p.h"
+#  include "tqfontcodecs_p.h"
 #endif
 
 #ifdef TQT_THREAD_SUPPORT
diff --git a/src/codecs/qtsciicodec.cpp b/src/codecs/tqtsciicodec.cpp
index 0bf558e69..c12ee71a3 100644
--- a/src/codecs/qtsciicodec.cpp
+++ b/src/codecs/tqtsciicodec.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 ntqtsciicodec.h
+/*! \class TQTsciiCodec tqtsciicodec.h
     \reentrant
     \ingroup i18n
 
@@ -92,7 +92,7 @@
   SUCH DAMAGE.
 */
 
-#include "ntqtsciicodec.h"
+#include "tqtsciicodec.h"
 
 #ifndef TQT_NO_CODECS
 
diff --git a/src/codecs/ntqtsciicodec.h b/src/codecs/tqtsciicodec.h
index a71a3fe91..a71a3fe91 100644
--- a/src/codecs/ntqtsciicodec.h
+++ b/src/codecs/tqtsciicodec.h
diff --git a/src/codecs/qutfcodec.cpp b/src/codecs/tqutfcodec.cpp
index 0a47f1523..1125aa9f3 100644
--- a/src/codecs/qutfcodec.cpp
+++ b/src/codecs/tqutfcodec.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqutfcodec.h"
+#include "tqutfcodec.h"
 
 #ifndef TQT_NO_TEXTCODEC
 
diff --git a/src/codecs/ntqutfcodec.h b/src/codecs/tqutfcodec.h
index c763238cd..c763238cd 100644
--- a/src/codecs/ntqutfcodec.h
+++ b/src/codecs/tqutfcodec.h
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 41b65486d..fefc761e2 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -64,7 +64,7 @@
 #include "ntqbrush.h"
 #include "ntqpalette.h"
 #include "tqwidget.h"
-#include "ntqjpunicode.h"
+#include "tqjpunicode.h"
 #include "tqtextcodec.h"
 #include "ntqpixmap.h"
 #include <ntqtabbar.h>
@@ -84,8 +84,8 @@
 #include "ntqdockwindow.h"
 #include "ntqcommonstyle.h"
 #include "ntqnetworkprotocol.h"
-#include <ntqeuckrcodec.h>
-#include <ntqgb18030codec.h>
+#include <tqeuckrcodec.h>
+#include <tqgb18030codec.h>
 #include "ntqgcache.h"
 #include <ntqgif.h>
 #include <ntqglcolormap.h>
@@ -112,8 +112,8 @@
 #include "ntqintdict.h"
 #include "ntqmotifstyle.h"
 #include "ntqpicture.h"
-#include <ntqjiscodec.h>
-#include <ntqeucjpcodec.h>
+#include <tqjiscodec.h>
+#include <tqeucjpcodec.h>
 #include <ntqkeycode.h>
 #include <ntqaccel.h>
 #include "ntqlabel.h"
@@ -175,7 +175,7 @@
 #include <ntqdockarea.h>
 #include "ntqregexp.h"
 #include <ntqclipboard.h>
-#include <ntqrtlcodec.h>
+#include <tqhebrewcodec.h>
 #include <ntqlistbox.h>
 #include <ntqgridview.h>
 #include "tqsemaphore.h"
@@ -192,7 +192,7 @@
 #include "ntqwmatrix.h"
 #include <ntqsizegrip.h>
 #include <ntqabstractlayout.h>
-#include <ntqsjiscodec.h>
+#include <tqsjiscodec.h>
 #include <ntqslider.h>
 #include <ntqsocket.h>
 #include <ntqserversocket.h>
@@ -230,7 +230,7 @@
 #include "tqsqleditorfactory.h"
 #include <ntqtabwidget.h>
 #include <tqtextbrowser.h>
-#include <ntqbig5codec.h>
+#include <tqbig5codec.h>
 #include <tqtextcodecfactory.h>
 #include <tqtextcodecplugin.h>
 #include <ntqmultilineedit.h>
@@ -243,11 +243,11 @@
 #include <ntqtoolbox.h>
 #include <ntqtooltip.h>
 #include "ntqdesktopwidget.h"
-#include <ntqtsciicodec.h>
+#include <tqtsciicodec.h>
 #include "ntqurl.h"
 #include "ntqurloperator.h"
 #include <ntqfiledialog.h>
-#include <ntqutfcodec.h>
+#include <tqutfcodec.h>
 #include <ntquuid.h>
 #include <ntqvalidator.h>
 #include <ntqasyncimageio.h>
@@ -277,7 +277,7 @@
 #include <private/qucom_p.h>
 #include "private/qcom_p.h"
 #include "private/tqimageformatinterface_p.h"
-#include "private/qisciicodec_p.h"
+#include "private/tqisciicodec_p.h"
 #include "private/qlayoutengine_p.h"
 #include "private/qcomlibrary_p.h"
 #include "private/qeffects_p.h"
@@ -290,7 +290,7 @@
 #include "private/tqstyleinterface_p.h"
 #include "private/qrichtext_p.h"
 #include "private/qsvgdevice_p.h"
-#include "private/qfontcodecs_p.h"
+#include "private/tqfontcodecs_p.h"
 #include "private/tqtextcodecinterface_p.h"
 #include "private/qpsprinter_p.h"
 #include "private/qtitlebar_p.h"
diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp
index 07c3fe2c6..9f5cd5744 100644
--- a/src/kernel/qfont_x11.cpp
+++ b/src/kernel/qfont_x11.cpp
@@ -54,7 +54,7 @@
 #include "ntqpaintdevicemetrics.h"
 #include "tqtextcodec.h"
 
-#include <private/qfontcodecs_p.h>
+#include <private/tqfontcodecs_p.h>
 #include <private/qunicodetables_p.h>
 #include "qfontdata_p.h"
 #include "qfontengine_p.h"
diff --git a/src/moc/moc.pro b/src/moc/moc.pro
index 32f30dc06..6917be73f 100644
--- a/src/moc/moc.pro
+++ b/src/moc/moc.pro
@@ -36,7 +36,7 @@ SOURCES		= ../tools/qbuffer.cpp	    \
 		  ../tools/tqmap.cpp         \
 		  ../tools/qgcache.cpp      \
 		  ../codecs/tqtextcodec.cpp \
-		  ../codecs/qutfcodec.cpp
+		  ../codecs/tqutfcodec.cpp
 
 isEmpty(QT_PRODUCT)|contains(QT_PRODUCT, qt-internal) {
     LEXSOURCES  = moc.l
diff --git a/src/qt.pro b/src/qt.pro
index 3f39f329e..fb76e0607 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -146,7 +146,7 @@ include($$OPENGL_CPP/qt_opengl.pri)
 include($$SQL_CPP/qt_sql.pri)
 include($$KERNEL_CPP/qt_gfx.pri)
 include($$TOOLS_CPP/qt_tools.pri)
-include($$CODECS_CPP/qt_codecs.pri)
+include($$CODECS_CPP/tqt_codecs.pri)
 include($$STYLES_CPP/qt_styles.pri)
 
 # qconfig.cpp