Rename text nt* related files to equivalent tq*

Signed-off-by: Michele Calgaro <[email protected]>

81 files changed, 135 insertions, 135 deletions

diff --git a/src/codecs/ntqbig5codec.h b/src/codecs/ntqbig5codec.h
index 73039967f..d2f1f7c84 100644
--- a/src/codecs/ntqbig5codec.h
+++ b/src/codecs/ntqbig5codec.h
@@ -46,7 +46,7 @@
 #define TQBIG5CODEC_H
 
 #ifndef QT_H
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #endif // QT_H
 
 #ifndef TQT_NO_BIG_CODECS
diff --git a/src/codecs/ntqeucjpcodec.h b/src/codecs/ntqeucjpcodec.h
index 6ccbcddb2..39b768665 100644
--- a/src/codecs/ntqeucjpcodec.h
+++ b/src/codecs/ntqeucjpcodec.h
@@ -71,7 +71,7 @@
 #define TQEUCJPCODEC_H
 
 #ifndef QT_H
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #include "ntqjpunicode.h"
 #endif // QT_H
 
diff --git a/src/codecs/ntqeuckrcodec.h b/src/codecs/ntqeuckrcodec.h
index fcd97a964..513c85f0b 100644
--- a/src/codecs/ntqeuckrcodec.h
+++ b/src/codecs/ntqeuckrcodec.h
@@ -67,7 +67,7 @@
 #define TQEUCKRCODEC_H
 
 #ifndef QT_H
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #endif // QT_H
 
 #ifndef TQT_NO_BIG_CODECS
diff --git a/src/codecs/ntqgb18030codec.h b/src/codecs/ntqgb18030codec.h
index 676a08a18..c28c6222d 100644
--- a/src/codecs/ntqgb18030codec.h
+++ b/src/codecs/ntqgb18030codec.h
@@ -42,7 +42,7 @@
 #define TQGB18030CODEC_H
 
 #ifndef QT_H
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #endif // QT_H
 
 
diff --git a/src/codecs/ntqjiscodec.h b/src/codecs/ntqjiscodec.h
index b96d0aec2..3e914f489 100644
--- a/src/codecs/ntqjiscodec.h
+++ b/src/codecs/ntqjiscodec.h
@@ -71,7 +71,7 @@
 #define TQJISCODEC_H
 
 #ifndef QT_H
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #include "ntqjpunicode.h"
 #endif // QT_H
 
diff --git a/src/codecs/ntqrtlcodec.h b/src/codecs/ntqrtlcodec.h
index f40161250..bbd990df6 100644
--- a/src/codecs/ntqrtlcodec.h
+++ b/src/codecs/ntqrtlcodec.h
@@ -42,7 +42,7 @@
 #define TQRTLCODEC_H
 
 #ifndef QT_H
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #endif // QT_H
 
 #ifndef TQT_NO_CODEC_HEBREW
diff --git a/src/codecs/ntqsjiscodec.h b/src/codecs/ntqsjiscodec.h
index a1acc053e..8a5f83aae 100644
--- a/src/codecs/ntqsjiscodec.h
+++ b/src/codecs/ntqsjiscodec.h
@@ -71,7 +71,7 @@
 #define TQSJISCODEC_H
 
 #ifndef QT_H
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #include "ntqjpunicode.h"
 #endif // QT_H
 
diff --git a/src/codecs/ntqtsciicodec.h b/src/codecs/ntqtsciicodec.h
index bbea40f2d..a71a3fe91 100644
--- a/src/codecs/ntqtsciicodec.h
+++ b/src/codecs/ntqtsciicodec.h
@@ -69,7 +69,7 @@
 #define TQTSCIICODEC_H
 
 #ifndef QT_H
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #endif // QT_H
 
 #ifndef TQT_NO_CODECS
diff --git a/src/codecs/ntqutfcodec.h b/src/codecs/ntqutfcodec.h
index c6303a3c4..c763238cd 100644
--- a/src/codecs/ntqutfcodec.h
+++ b/src/codecs/ntqutfcodec.h
@@ -42,7 +42,7 @@
 #define TQUTFCODEC_H
 
 #ifndef QT_H
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #endif // QT_H
 
 #ifndef TQT_NO_TEXTCODEC
diff --git a/src/codecs/qfontcodecs_p.h b/src/codecs/qfontcodecs_p.h
index cc2cd40b0..b9ba7ebd4 100644
--- a/src/codecs/qfontcodecs_p.h
+++ b/src/codecs/qfontcodecs_p.h
@@ -55,7 +55,7 @@
 
 #ifndef QT_H
 #include "ntqglobal.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #endif // QT_H
 
 
diff --git a/src/codecs/qisciicodec_p.h b/src/codecs/qisciicodec_p.h
index 2fe0a1150..372415cf1 100644
--- a/src/codecs/qisciicodec_p.h
+++ b/src/codecs/qisciicodec_p.h
@@ -2,7 +2,7 @@
 #define TQISCIICODEC_H
 
 #ifndef QT_H
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #endif // QT_H
 
 #ifndef TQT_NO_CODECS
diff --git a/src/codecs/qrtlcodec.cpp b/src/codecs/qrtlcodec.cpp
index f4e471b0a..de377f538 100644
--- a/src/codecs/qrtlcodec.cpp
+++ b/src/codecs/qrtlcodec.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqrtlcodec.h"
-#include <private/qtextengine_p.h>
+#include <private/tqtextengine_p.h>
 
 #ifndef TQT_NO_CODEC_HEBREW
 
diff --git a/src/codecs/qt_codecs.pri b/src/codecs/qt_codecs.pri
index 196448d3b..80ec0c22f 100644
--- a/src/codecs/qt_codecs.pri
+++ b/src/codecs/qt_codecs.pri
@@ -14,12 +14,12 @@ tools {
 		  $$CODECS_H/ntqjpunicode.h \
 		  $$CODECS_H/ntqrtlcodec.h \
 		  $$CODECS_H/ntqsjiscodec.h \
-		  $$CODECS_H/ntqtextcodec.h \
+		  $$CODECS_H/tqtextcodec.h \
 		  $$CODECS_H/ntqtsciicodec.h \
 		  $$CODECS_H/ntqutfcodec.h \
-		  $$CODECS_P/qtextcodecinterface_p.h \
-		  $$CODECS_H/ntqtextcodecfactory.h \
-		  $$CODECS_H/ntqtextcodecplugin.h
+		  $$CODECS_P/tqtextcodecinterface_p.h \
+		  $$CODECS_H/tqtextcodecfactory.h \
+		  $$CODECS_H/tqtextcodecplugin.h
 
 	SOURCES += \
 #$$CODECS_CPP/qasmocodec.cpp \
@@ -32,11 +32,11 @@ tools {
 		  $$CODECS_CPP/qjpunicode.cpp \
 		  $$CODECS_CPP/qrtlcodec.cpp \
 		  $$CODECS_CPP/qsjiscodec.cpp \
-		  $$CODECS_CPP/qtextcodec.cpp \
+		  $$CODECS_CPP/tqtextcodec.cpp \
 		  $$CODECS_CPP/qtsciicodec.cpp \
 		  $$CODECS_CPP/qutfcodec.cpp \
-		  $$CODECS_CPP/qtextcodecfactory.cpp \
-		  $$CODECS_CPP/qtextcodecplugin.cpp
+		  $$CODECS_CPP/tqtextcodecfactory.cpp \
+		  $$CODECS_CPP/tqtextcodecplugin.cpp
 
 	x11:SOURCES += $$CODECS_CPP/qfontcncodec.cpp  \
 	               $$CODECS_CPP/qfonthkcodec.cpp  \
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/tqtextcodec.cpp
index 632dface1..cf7c6b93d 100644
--- a/src/codecs/qtextcodec.cpp
+++ b/src/codecs/tqtextcodec.cpp
@@ -45,11 +45,11 @@
 # undef open
 #endif
 
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #ifndef TQT_NO_TEXTCODEC
 
 #include "tqvaluelist.h"
-#include "ntqtextcodecfactory.h"
+#include "tqtextcodecfactory.h"
 #include "ntqutfcodec.h"
 #include "ntqnamespace.h"
 #ifndef TQT_NO_CODECS
@@ -98,7 +98,7 @@ public:
 	TQTextCodec::deleteAllCodecs();
     }
 };
-static TQTextCodecCleanup qtextcodec_cleanup;
+static TQTextCodecCleanup tqtextcodec_cleanup;
 
 /*!
     Deletes all the created codecs.
@@ -184,7 +184,7 @@ TQString TQTextStatelessDecoder::toUnicode(const char* chars, int len)
 
 
 /*!
-    \class TQTextCodec ntqtextcodec.h
+    \class TQTextCodec tqtextcodec.h
     \brief The TQTextCodec class provides conversion between text encodings.
     \reentrant
     \ingroup i18n
@@ -1180,7 +1180,7 @@ bool TQTextCodec::canEncode( const TQString& s ) const
 
 
 /*!
-    \class TQTextEncoder ntqtextcodec.h
+    \class TQTextEncoder tqtextcodec.h
     \brief The TQTextEncoder class provides a state-based encoder.
     \reentrant
     \ingroup i18n
@@ -1212,7 +1212,7 @@ TQTextEncoder::~TQTextEncoder()
 */
 
 /*!
-    \class TQTextDecoder ntqtextcodec.h
+    \class TQTextDecoder tqtextcodec.h
     \brief The TQTextDecoder class provides a state-based decoder.
     \reentrant
     \ingroup i18n
diff --git a/src/codecs/ntqtextcodec.h b/src/codecs/tqtextcodec.h
index f5554d261..f5554d261 100644
--- a/src/codecs/ntqtextcodec.h
+++ b/src/codecs/tqtextcodec.h
diff --git a/src/codecs/qtextcodecfactory.cpp b/src/codecs/tqtextcodecfactory.cpp
index 6a570157b..24ac82a09 100644
--- a/src/codecs/qtextcodecfactory.cpp
+++ b/src/codecs/tqtextcodecfactory.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqtextcodecfactory.h"
+#include "tqtextcodecfactory.h"
 
 #ifndef TQT_NO_TEXTCODEC
 
@@ -46,7 +46,7 @@
 #include "ntqapplication.h"
 #include "ntqcleanuphandler.h"
 #include <private/qpluginmanager_p.h>
-#include "qtextcodecinterface_p.h"
+#include "tqtextcodecinterface_p.h"
 
 #ifdef TQT_THREAD_SUPPORT
 #  include <private/qmutexpool_p.h>
diff --git a/src/codecs/ntqtextcodecfactory.h b/src/codecs/tqtextcodecfactory.h
index 74cca82ca..74cca82ca 100644
--- a/src/codecs/ntqtextcodecfactory.h
+++ b/src/codecs/tqtextcodecfactory.h
diff --git a/src/codecs/qtextcodecinterface_p.h b/src/codecs/tqtextcodecinterface_p.h
index 5a8baa04a..5a8baa04a 100644
--- a/src/codecs/qtextcodecinterface_p.h
+++ b/src/codecs/tqtextcodecinterface_p.h
diff --git a/src/codecs/qtextcodecplugin.cpp b/src/codecs/tqtextcodecplugin.cpp
index d59e8684d..046b009f7 100644
--- a/src/codecs/qtextcodecplugin.cpp
+++ b/src/codecs/tqtextcodecplugin.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "ntqtextcodecplugin.h"
+#include "tqtextcodecplugin.h"
 #ifndef TQT_NO_TEXTCODECPLUGIN
-#include "qtextcodecinterface_p.h"
+#include "tqtextcodecinterface_p.h"
 
 /*!
-    \class TQTextCodecPlugin ntqtextcodecplugin.h
+    \class TQTextCodecPlugin tqtextcodecplugin.h
     \brief The TQTextCodecPlugin class provides an abstract base for custom TQTextCodec plugins.
     \reentrant
     \ingroup plugins
diff --git a/src/codecs/ntqtextcodecplugin.h b/src/codecs/tqtextcodecplugin.h
index 13a83733d..13a83733d 100644
--- a/src/codecs/ntqtextcodecplugin.h
+++ b/src/codecs/tqtextcodecplugin.h
diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp
index 9d27e023a..e2b302e55 100644
--- a/src/dialogs/qerrormessage.cpp
+++ b/src/dialogs/qerrormessage.cpp
@@ -51,7 +51,7 @@
 #include "ntqpushbutton.h"
 #include "tqstringlist.h"
 #include "ntqstylesheet.h"
-#include "ntqtextview.h"
+#include "tqtextview.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp
index 0e37e8615..2402de7d3 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/qprintdialog.cpp
@@ -44,7 +44,7 @@
 
 #include "ntqfiledialog.h"
 #include "ntqfile.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "ntqcombobox.h"
 #include "ntqframe.h"
 #include "ntqlabel.h"
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index 8bdc0a374..03c58309c 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -920,7 +920,7 @@ public:
 	LogText
     };
 
-    // Documented in qtextedit.cpp
+    // Documented in tqtextedit.cpp
     enum AnchorAttribute {
 	AnchorName,
 	AnchorHref
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 876d07c1f..3e62736f3 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -36,7 +36,7 @@
 #include "tqpair.h"
 #include "ntqpoint.h"
 #include <stdio.h>
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "ntqfontinfo.h"
 #include "ntqsizepolicy.h"
 #include "ntqtl.h"
@@ -65,7 +65,7 @@
 #include "ntqpalette.h"
 #include "tqwidget.h"
 #include "ntqjpunicode.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #include "ntqpixmap.h"
 #include <ntqtabbar.h>
 #include "ntqiconset.h"
@@ -224,18 +224,18 @@
 #include <ntqinterlacestyle.h>
 #include <ntqstylefactory.h>
 #include <ntqstyleplugin.h>
-#include "ntqtextedit.h"
+#include "tqtextedit.h"
 #include <ntqsyntaxhighlighter.h>
 #include <ntqtabdialog.h>
 #include "tqsqleditorfactory.h"
 #include <ntqtabwidget.h>
-#include <ntqtextbrowser.h>
+#include <tqtextbrowser.h>
 #include <ntqbig5codec.h>
-#include <ntqtextcodecfactory.h>
-#include <ntqtextcodecplugin.h>
+#include <tqtextcodecfactory.h>
+#include <tqtextcodecplugin.h>
 #include <ntqmultilineedit.h>
 #include "ntqtoolbar.h"
-#include <ntqtextview.h>
+#include <tqtextview.h>
 #include "ntqwaitcondition.h"
 #include <ntqasyncio.h>
 #include <ntqfontdatabase.h>
@@ -295,7 +295,7 @@
 #include "private/qrichtext_p.h"
 #include "private/qsvgdevice_p.h"
 #include "private/qfontcodecs_p.h"
-#include "private/qtextcodecinterface_p.h"
+#include "private/tqtextcodecinterface_p.h"
 #include "private/qpsprinter_p.h"
 #include "private/qtitlebar_p.h"
 #include "private/qucom_p.h"
@@ -325,7 +325,7 @@
 #endif
 
 #ifdef TQ_WS_QWS
-#include <private/qtextengine_p.h>
+#include <private/tqtextengine_p.h>
 #include "qfontmanager_qws.h"
 #include <qfontfactorybdf_qws.h>
 #include <qgfxvoodoodefs_qws.h>
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index e5b28642b..baf5ba495 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -49,7 +49,7 @@
 #include "ntqcleanuphandler.h"
 
 #include "ntqtranslator.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #include "ntqsessionmanager.h"
 #include "ntqdragobject.h"
 #include "ntqclipboard.h"
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 57c55feba..0cfd812c2 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -74,7 +74,7 @@
 #include "ntqpainter.h"
 #include "ntqpixmapcache.h"
 #include "ntqdatetime.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #include "ntqdatastream.h"
 #include "ntqbuffer.h"
 #include "ntqsocketnotifier.h"
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp
index 51fbc63ab..7776cf606 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/qclipboard_x11.cpp
@@ -70,7 +70,7 @@
 #include "ntqdatetime.h"
 #include "ntqdragobject.h"
 #include "ntqbuffer.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #include "tqvaluelist.h"
 #include "tqmap.h"
 #include "qt_x11_p.h"
diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp
index 5e6a0dab9..9854c33a3 100644
--- a/src/kernel/qdragobject.cpp
+++ b/src/kernel/qdragobject.cpp
@@ -46,7 +46,7 @@
 #ifndef TQT_NO_MIME
 
 #include "ntqdragobject.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #include "ntqapplication.h"
 #include "ntqpoint.h"
 #include "tqwidget.h"
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index b442a3253..387f75dfe 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -59,7 +59,7 @@
 #include "qfontdata_p.h"
 #include "qfontengine_p.h"
 #include "qpainter_p.h"
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
 
 // #define TQFONTCACHE_DEBUG
 #ifdef TQFONTCACHE_DEBUG
diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp
index 3cd207c65..07c3fe2c6 100644
--- a/src/kernel/qfont_x11.cpp
+++ b/src/kernel/qfont_x11.cpp
@@ -52,13 +52,13 @@
 #include "ntqfontmetrics.h"
 #include "ntqpaintdevice.h"
 #include "ntqpaintdevicemetrics.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 
 #include <private/qfontcodecs_p.h>
 #include <private/qunicodetables_p.h>
 #include "qfontdata_p.h"
 #include "qfontengine_p.h"
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
 
 #include "qt_x11_p.h"
 
diff --git a/src/kernel/qfontengine_p.h b/src/kernel/qfontengine_p.h
index 17aa618b6..9e3c31261 100644
--- a/src/kernel/qfontengine_p.h
+++ b/src/kernel/qfontengine_p.h
@@ -46,7 +46,7 @@
 #include "tqptrdict.h"
 #endif
 
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
 
 class TQPaintDevice;
 
@@ -475,7 +475,7 @@ class TQTextEngine;
 #ifndef TQT_NO_XFTFREETYPE
 
 #include "qscriptengine_p.h"
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include "ftxopen.h"
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index 5cf756265..54bedb33e 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -42,7 +42,7 @@
 
 #include <tqwidget.h>
 #include <ntqcstring.h>
-#include <ntqtextcodec.h>
+#include <tqtextcodec.h>
 
 #include "ntqbitmap.h"
 #include "ntqfontdatabase.h"
@@ -54,7 +54,7 @@
 #include "qt_x11_p.h"
 
 #include "ntqfont.h"
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
 
 #include <private/qunicodetables_p.h>
 
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index 3f91a8023..82840cc27 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -56,7 +56,7 @@
 #endif
 #include <string.h>
 
-#include "qtextlayout_p.h"
+#include "tqtextlayout_p.h"
 #include "qfontengine_p.h"
 
 #ifndef TQT_NO_TRANSFORMATIONS
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index a4f71fc00..0e72d64da 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -45,15 +45,15 @@
 #include "tqwidget.h"
 #include "ntqbitmap.h"
 #include "ntqpixmapcache.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #include "ntqpaintdevicemetrics.h"
 
 #include "qt_x11_p.h"
 
-#include "qtextlayout_p.h"
+#include "tqtextlayout_p.h"
 #include "qfontdata_p.h"
 #include "qfontengine_p.h"
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
 
 #include <math.h>
 
@@ -435,7 +435,7 @@ static void init_gc_cache()
 
 // #define GC_CACHE_STAT
 #if defined(GC_CACHE_STAT)
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "ntqbuffer.h"
 
 static int g_numhits    = 0;
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index 6974fdf6c..22acd9832 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -67,7 +67,7 @@
 #include "ntqfile.h"
 #include "ntqbuffer.h"
 #include "ntqintdict.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #include "ntqsettings.h"
 #include "tqmap.h"
 #include "ntqfontdatabase.h"
@@ -98,8 +98,8 @@
 #if defined( TQ_WS_X11 ) || defined (TQ_WS_QWS)
 #include "qfontdata_p.h"
 #include "qfontengine_p.h"
-#include "qtextlayout_p.h"
-#include "qtextengine_p.h"
+#include "tqtextlayout_p.h"
+#include "tqtextengine_p.h"
 extern bool tqt_has_xft;
 #endif
 
diff --git a/src/kernel/qpsprinter_p.h b/src/kernel/qpsprinter_p.h
index 6b96a965d..47939b1db 100644
--- a/src/kernel/qpsprinter_p.h
+++ b/src/kernel/qpsprinter_p.h
@@ -59,7 +59,7 @@
 
 #ifndef QT_H
 #include "ntqprinter.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #endif // QT_H
 
 #ifndef TQT_NO_PRINTER
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index 484553d3e..cd4c31055 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -45,7 +45,7 @@
 
 #include "tqstringlist.h"
 #include "ntqfont.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "ntqfile.h"
 #include "ntqapplication.h"
 #include "tqmap.h"
@@ -62,7 +62,7 @@
 #include "tqptrdict.h"
 #include "ntqstyle.h"
 #include "ntqcleanuphandler.h"
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
 #include <private/qunicodetables_p.h>
 
 #include <stdlib.h>
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index 52762c6b4..58fed9826 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -118,7 +118,7 @@ public:
     enum Type { Regular=0, Custom=1, Anchor=2, CustomAnchor=3 };
 
     TQChar c;
-    // this is the same struct as in qtextengine_p.h. Don't change!
+    // this is the same struct as in tqtextengine_p.h. Don't change!
     uchar softBreak      :1;     // Potential linebreak point
     uchar whiteSpace     :1;     // A unicode whitespace character, except NBSP, ZWNBSP
     uchar charStop       :1;     // Valid cursor position (for left/right arrow)
diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp
index 08cac102f..5e18dad56 100644
--- a/src/kernel/qscriptengine.cpp
+++ b/src/kernel/qscriptengine.cpp
@@ -40,7 +40,7 @@
 #include "ntqrect.h"
 #include "ntqfont.h"
 #include <private/qunicodetables_p.h>
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
 #include "qfontengine_p.h"
 #include <stdlib.h>
 
diff --git a/src/kernel/qscriptengine_p.h b/src/kernel/qscriptengine_p.h
index 1c5d55370..77dd87b96 100644
--- a/src/kernel/qscriptengine_p.h
+++ b/src/kernel/qscriptengine_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
 
 class TQString;
 struct TQCharAttributes;
diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/qscriptengine_x11.cpp
index 97ae6828b..6c1190fb3 100644
--- a/src/kernel/qscriptengine_x11.cpp
+++ b/src/kernel/qscriptengine_x11.cpp
@@ -1899,7 +1899,7 @@ static void indic_attributes(int script, const TQString &text, int from, int len
 //
 // --------------------------------------------------------------------------------------------------------------------------------------------
 
-#include <ntqtextcodec.h>
+#include <tqtextcodec.h>
 #include <ntqlibrary.h>
 
 
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index cf370058b..5f20c7111 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -94,9 +94,9 @@ kernel {
 		  $$KERNEL_H/ntqgplugin.h \
 		  $$KERNEL_H/ntqsimplerichtext.h \
 		  $$KERNEL_CPP/qscriptengine_p.h \
-		  $$KERNEL_CPP/qtextengine_p.h \
+		  $$KERNEL_CPP/tqtextengine_p.h \
 		  $$KERNEL_CPP/qfontengine_p.h \
-		  $$KERNEL_CPP/qtextlayout_p.h
+		  $$KERNEL_CPP/tqtextlayout_p.h
 
 	inputmethod {
 		unix:x11 {
@@ -264,8 +264,8 @@ kernel {
 		  $$KERNEL_CPP/qgplugin.cpp \
 		  $$KERNEL_CPP/qsimplerichtext.cpp \
 		  $$KERNEL_CPP/qscriptengine.cpp \
-		  $$KERNEL_CPP/qtextlayout.cpp \
-		  $$KERNEL_CPP/qtextengine.cpp
+		  $$KERNEL_CPP/tqtextlayout.cpp \
+		  $$KERNEL_CPP/tqtextengine.cpp
 
 	unix:HEADERS   += $$KERNEL_P/qpsprinter_p.h \
 			  $$KERNEL_H/ntqfontdatabase.h
diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp
index 7a454818e..d31168c70 100644
--- a/src/kernel/tqimage.cpp
+++ b/src/kernel/tqimage.cpp
@@ -42,7 +42,7 @@
 #include "ntqregexp.h"
 #include "ntqfile.h"
 #include "ntqdatastream.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "ntqbuffer.h"
 #include "tqptrlist.h"
 #include "ntqasyncimageio.h"
diff --git a/src/kernel/qtextengine.cpp b/src/kernel/tqtextengine.cpp
index e1a806f52..b66fb7d95 100644
--- a/src/kernel/qtextengine.cpp
+++ b/src/kernel/tqtextengine.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#include "qtextengine_p.h"
+#include "tqtextengine_p.h"
 
 #include "qscriptengine_p.h"
 #include <ntqfont.h>
@@ -876,11 +876,11 @@ static void calcLineBreaks(const TQString &str, TQCharAttributes *charAttributes
 }
 
 #if defined( TQ_WS_X11 ) || defined ( TQ_WS_QWS )
-# include "qtextengine_unix.cpp"
+# include "tqtextengine_unix.cpp"
 #elif defined( TQ_WS_WIN )
-# include "qtextengine_win.cpp"
+# include "tqtextengine_win.cpp"
 #elif defined( TQ_WS_MAC )
-# include "qtextengine_mac.cpp"
+# include "tqtextengine_mac.cpp"
 #endif
 
 
diff --git a/src/kernel/qtextengine_p.h b/src/kernel/tqtextengine_p.h
index 774302a07..774302a07 100644
--- a/src/kernel/qtextengine_p.h
+++ b/src/kernel/tqtextengine_p.h
diff --git a/src/kernel/qtextengine_unix.cpp b/src/kernel/tqtextengine_unix.cpp
index 0d5e3b920..0d5e3b920 100644
--- a/src/kernel/qtextengine_unix.cpp
+++ b/src/kernel/tqtextengine_unix.cpp
diff --git a/src/kernel/qtextlayout.cpp b/src/kernel/tqtextlayout.cpp
index 777e61ad7..41be6076a 100644
--- a/src/kernel/qtextlayout.cpp
+++ b/src/kernel/tqtextlayout.cpp
@@ -36,8 +36,8 @@
 **
 **********************************************************************/
 
-#include "qtextlayout_p.h"
-#include "qtextengine_p.h"
+#include "tqtextlayout_p.h"
+#include "tqtextengine_p.h"
 
 #include <ntqfont.h>
 #include <ntqapplication.h>
diff --git a/src/kernel/qtextlayout_p.h b/src/kernel/tqtextlayout_p.h
index 64c7f64db..64c7f64db 100644
--- a/src/kernel/qtextlayout_p.h
+++ b/src/kernel/tqtextlayout_p.h
diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index ff33dddbf..78d1e850e 100644
--- a/src/kernel/tqwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -47,7 +47,7 @@
 #include "tqimage.h"
 #include "tqobjectlist.h"
 #include "ntqlayout.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #include "ntqdatetime.h"
 #include "ntqcursor.h"
 #include "qt_x11_p.h"
@@ -3055,7 +3055,7 @@ void TQWidget::destroyInputContext()
 
 /*!
     This function is called when text widgets need to be neutral state to
-    execute text operations properly. See qlineedit.cpp and qtextedit.cpp as
+    execute text operations properly. See qlineedit.cpp and tqtextedit.cpp as
     example.
 
     Ordinary reset that along with changing focus to another widget,
diff --git a/src/moc/moc.pro b/src/moc/moc.pro
index e2f92ef17..566a8589f 100644
--- a/src/moc/moc.pro
+++ b/src/moc/moc.pro
@@ -31,11 +31,11 @@ SOURCES		= ../tools/qbuffer.cpp	    \
 		  ../tools/qlocale.cpp	    \
                   ../tools/qunicodetables.cpp \
 		  ../tools/tqstringlist.cpp  \
-		  ../tools/qtextstream.cpp  \
+		  ../tools/tqtextstream.cpp  \
 		  ../tools/qbitarray.cpp    \
 		  ../tools/tqmap.cpp         \
 		  ../tools/qgcache.cpp      \
-		  ../codecs/qtextcodec.cpp \
+		  ../codecs/tqtextcodec.cpp \
 		  ../codecs/qutfcodec.cpp
 
 isEmpty(QT_PRODUCT)|contains(QT_PRODUCT, qt-internal) {
diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp
index 4be302d5a..dc641569a 100644
--- a/src/network/qdns.cpp
+++ b/src/network/qdns.cpp
@@ -74,7 +74,7 @@
 #include "tqstrlist.h"
 #include "tqptrdict.h"
 #include "ntqfile.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "ntqsocketdevice.h"
 #include "ntqcleanuphandler.h"
 #include <limits.h>
diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp
index ac4d442e0..b5da887d6 100644
--- a/src/network/qftp.cpp
+++ b/src/network/qftp.cpp
@@ -53,7 +53,7 @@
 #include "tqptrdict.h" // binary compatibility
 
 #ifndef TQT_NO_TEXTCODEC
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #endif
 
 //#define TQFTPPI_DEBUG
diff --git a/src/network/qhttp.cpp b/src/network/qhttp.cpp
index 8f88e0340..b37d4789d 100644
--- a/src/network/qhttp.cpp
+++ b/src/network/qhttp.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_NETWORKPROTOCOL_HTTP
 
 #include "ntqsocket.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "tqmap.h"
 #include "tqstring.h"
 #include "tqstringlist.h"
diff --git a/src/qt.pro b/src/qt.pro
index e66adeef5..e359ea36c 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -182,14 +182,14 @@ wince-* {
 		   $$KERNEL_CPP/ntqgplugin.h \
 		   $$KERNEL_CPP/tqimageformatplugin.h \
 		   $$STYLES_CPP/ntqstyleplugin.h \
-		   $$CODECS_CPP/ntqtextcodecplugin.h \
+		   $$CODECS_CPP/tqtextcodecplugin.h \
 		   $$WIDGETS_CPP/tqwidgetplugin.h
 
 	SOURCES -= $$TOOLS_CPP/qcomlibrary.cpp \
 		   $$KERNEL_CPP/qgplugin.cpp \
 		   $$KERNEL_CPP/tqimageformatplugin.cpp \
 		   $$STYLES_CPP/qstyleplugin.cpp \
-		   $$CODECS_CPP/qtextcodecplugin.cpp \
+		   $$CODECS_CPP/tqtextcodecplugin.cpp \
 		   $$WIDGETS_CPP/tqwidgetplugin.cpp 
 }
 
diff --git a/src/styles/qsgistyle.cpp b/src/styles/qsgistyle.cpp
index 54b9bfc8c..8fd36f70e 100644
--- a/src/styles/qsgistyle.cpp
+++ b/src/styles/qsgistyle.cpp
@@ -54,7 +54,7 @@
 #include "ntqscrollbar.h"
 #include "ntqcombobox.h"
 #include "ntqslider.h"
-#include "ntqtextedit.h"
+#include "tqtextedit.h"
 #include "ntqtoolbar.h"
 #include "ntqlineedit.h"
 #include "ntqmenubar.h"
diff --git a/src/tools/ntqtl.h b/src/tools/ntqtl.h
index 8b8724f9e..712129746 100644
--- a/src/tools/ntqtl.h
+++ b/src/tools/ntqtl.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqglobal.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "tqstring.h"
 #endif // QT_H
 
diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt
index 3c14ef270..fd6cb62cb 100644
--- a/src/tools/qfeatures.txt
+++ b/src/tools/qfeatures.txt
@@ -194,7 +194,7 @@ SeeAlso: ???
 Feature: TEXTSTREAM
 Section: File I/O
 Requires:
-Name: QTextStream
+Name: TQTextStream
 SeeAlso: ???
 
 Feature: DATASTREAM
@@ -993,7 +993,7 @@ SeeAlso: ???
 Feature: TEXTVIEW
 Section: Widgets
 Requires: TEXTEDIT
-Name: QTextView
+Name: TQTextView
 SeeAlso: ???
 
 Feature: TEXTEDIT
@@ -1090,7 +1090,7 @@ SeeAlso: ???
 Feature: TEXTBROWSER
 Section: Widgets
 Requires: TEXTVIEW MIME
-Name: QTextBrowser
+Name: TQTextBrowser
 SeeAlso: ???
 
 Feature: LISTBOX
@@ -1276,7 +1276,7 @@ SeeAlso: ???
 Feature: TEXTCODECPLUGIN
 Section: Internationalization
 Requires: COMPONENT TEXTCODEC
-Name: QTextCodecPlugin
+Name: TQTextCodecPlugin
 SeeAlso: ???
 
 
diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp
index ecaa3f7d6..ebec81889 100644
--- a/src/tools/qsettings.cpp
+++ b/src/tools/qsettings.cpp
@@ -61,7 +61,7 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
 #include "ntqfile.h"
 #include "ntqfileinfo.h"
 #include "tqmap.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "ntqregexp.h"
 #include <private/qsettings_p.h>
 #ifndef NO_ERRNO_H
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index 283d7c5ed..54cfd4414 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -55,7 +55,7 @@ tools {
 		  $$TOOLS_H/tqstringlist.h \
 		  $$TOOLS_H/tqstrlist.h \
 		  $$TOOLS_H/tqstrvec.h \
-		  $$TOOLS_H/ntqtextstream.h \
+		  $$TOOLS_H/tqtextstream.h \
 		  $$TOOLS_P/qthreadinstance_p.h \
 		  $$TOOLS_H/ntqthreadstorage.h\
 		  $$TOOLS_P/qunicodetables_p.h \
@@ -135,7 +135,7 @@ tools {
 		  $$TOOLS_CPP/qsemaphore.cpp \
 		  $$TOOLS_CPP/qsettings.cpp \
 		  $$TOOLS_CPP/tqstringlist.cpp \
-		  $$TOOLS_CPP/qtextstream.cpp \
+		  $$TOOLS_CPP/tqtextstream.cpp \
 		  $$TOOLS_CPP/qunicodetables.cpp \
 		  $$TOOLS_CPP/qucom.cpp \
 		  $$TOOLS_CPP/quuid.cpp
diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp
index a48af12fc..fff59c613 100644
--- a/src/tools/tqstring.cpp
+++ b/src/tools/tqstring.cpp
@@ -54,7 +54,7 @@
 #include "ntqregexp.h"
 #include "ntqdatastream.h"
 #ifndef TQT_NO_TEXTCODEC
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #endif
 #include "ntqlocale.h"
 #include "qlocale_p.h"
diff --git a/src/tools/qtextstream.cpp b/src/tools/tqtextstream.cpp
index 85059dafc..218c9b106 100644
--- a/src/tools/qtextstream.cpp
+++ b/src/tools/tqtextstream.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 
 #ifndef TQT_NO_TEXTSTREAM
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #include "ntqregexp.h"
 #include "ntqbuffer.h"
 #include "ntqfile.h"
@@ -57,7 +57,7 @@
 #endif
 
 /*!
-    \class TQTextStream ntqtextstream.h
+    \class TQTextStream tqtextstream.h
     \reentrant
     \brief The TQTextStream class provides basic functions for reading
     and writing text using a TQIODevice.
@@ -2397,7 +2397,7 @@ TQTextStream &reset( TQTextStream &s )
 
 
 /*!
-    \class TQTextIStream ntqtextstream.h
+    \class TQTextIStream tqtextstream.h
     \reentrant
     \brief The TQTextIStream class is a convenience class for input streams.
 
diff --git a/src/tools/ntqtextstream.h b/src/tools/tqtextstream.h
index ab2366b39..ab2366b39 100644
--- a/src/tools/ntqtextstream.h
+++ b/src/tools/tqtextstream.h
diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h
index 441f4b828..f70f61fe5 100644
--- a/src/widgets/ntqdockarea.h
+++ b/src/widgets/ntqdockarea.h
@@ -48,7 +48,7 @@
 #include "ntqlayout.h"
 #include "tqvaluelist.h"
 #include "ntqguardedptr.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #endif // QT_H
 
 #ifndef TQT_NO_MAINWINDOW
diff --git a/src/widgets/ntqmainwindow.h b/src/widgets/ntqmainwindow.h
index 73265436a..548bbae88 100644
--- a/src/widgets/ntqmainwindow.h
+++ b/src/widgets/ntqmainwindow.h
@@ -45,7 +45,7 @@
 #include "tqwidget.h"
 #include "ntqtoolbar.h"
 #include "tqptrlist.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #endif // QT_H
 
 #ifndef TQT_NO_MAINWINDOW
diff --git a/src/widgets/ntqmultilineedit.h b/src/widgets/ntqmultilineedit.h
index bbf22d8bd..1f53dc38f 100644
--- a/src/widgets/ntqmultilineedit.h
+++ b/src/widgets/ntqmultilineedit.h
@@ -42,7 +42,7 @@
 #define TQMULTILINEEDIT_H
 
 #ifndef QT_H
-#include "ntqtextedit.h"
+#include "tqtextedit.h"
 #endif // QT_H
 
 #ifndef TQT_NO_MULTILINEEDIT
diff --git a/src/widgets/qcheckbox.cpp b/src/widgets/qcheckbox.cpp
index 970ed5785..0ef6529b0 100644
--- a/src/widgets/qcheckbox.cpp
+++ b/src/widgets/qcheckbox.cpp
@@ -45,7 +45,7 @@
 #include "ntqpixmap.h"
 #include "ntqpixmapcache.h"
 #include "ntqbitmap.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "ntqapplication.h"
 #include "ntqstyle.h"
 
diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp
index 36e1529c3..71baf927d 100644
--- a/src/widgets/qiconview.cpp
+++ b/src/widgets/qiconview.cpp
@@ -59,7 +59,7 @@
 #include "ntqtimer.h"
 #include "ntqcursor.h"
 #include "ntqapplication.h"
-#include "ntqtextedit.h"
+#include "tqtextedit.h"
 #include "ntqmemarray.h"
 #include "tqptrlist.h"
 #include "ntqvbox.h"
diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp
index 6ed133729..3894e35e6 100644
--- a/src/widgets/qlineedit.cpp
+++ b/src/widgets/qlineedit.cpp
@@ -61,7 +61,7 @@
 #include "ntqstyle.h"
 #include "ntqwhatsthis.h"
 #include "../kernel/qinternal_p.h"
-#include "private/qtextlayout_p.h"
+#include "private/tqtextlayout_p.h"
 #include "tqvaluevector.h"
 #if defined(Q_OS_LINUX)
 #include <sys/mman.h>
diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/qradiobutton.cpp
index f6e48df6e..b5de6b8d9 100644
--- a/src/widgets/qradiobutton.cpp
+++ b/src/widgets/qradiobutton.cpp
@@ -46,7 +46,7 @@
 #include "ntqpixmap.h"
 #include "ntqpixmapcache.h"
 #include "ntqbitmap.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "ntqapplication.h"
 #include "ntqstyle.h"
 
diff --git a/src/widgets/qsyntaxhighlighter.cpp b/src/widgets/qsyntaxhighlighter.cpp
index 814cc5a96..8cd8ba2a8 100644
--- a/src/widgets/qsyntaxhighlighter.cpp
+++ b/src/widgets/qsyntaxhighlighter.cpp
@@ -43,7 +43,7 @@
 
 #ifndef TQT_NO_SYNTAXHIGHLIGHTER
 #include "../kernel/qrichtext_p.h"
-#include "ntqtextedit.h"
+#include "tqtextedit.h"
 #include "ntqtimer.h"
 
 /*!
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index 8be28d1cf..263c0e473 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -59,9 +59,9 @@ widgets {
 		  $$WIDGETS_H/tqwidgetstack.h \
 		  $$WIDGETS_H/ntqaction.h \
 		  $$WIDGETS_H/ntqdatetimeedit.h \
-		  $$WIDGETS_H/ntqtextview.h \
-		  $$WIDGETS_H/ntqtextbrowser.h \
-		  $$WIDGETS_H/ntqtextedit.h \
+		  $$WIDGETS_H/tqtextview.h \
+		  $$WIDGETS_H/tqtextbrowser.h \
+		  $$WIDGETS_H/tqtextedit.h \
 		  $$WIDGETS_P/tqwidgetinterface_p.h \
 		  $$WIDGETS_H/tqwidgetplugin.h
 
@@ -122,9 +122,9 @@ widgets {
 		  $$WIDGETS_CPP/qaction.cpp \
 		  $$WIDGETS_CPP/qdatetimeedit.cpp \
 		  $$WIDGETS_CPP/qeffects.cpp \
-		  $$WIDGETS_CPP/qtextview.cpp \
-		  $$WIDGETS_CPP/qtextbrowser.cpp \
-		  $$WIDGETS_CPP/qtextedit.cpp \
+		  $$WIDGETS_CPP/tqtextview.cpp \
+		  $$WIDGETS_CPP/tqtextbrowser.cpp \
+		  $$WIDGETS_CPP/tqtextedit.cpp \
 		  $$WIDGETS_CPP/tqwidgetplugin.cpp
    !embedded:mac:SOURCES += $$WIDGETS_CPP/qmenubar_mac.cpp
 }
diff --git a/src/widgets/qtextbrowser.cpp b/src/widgets/tqtextbrowser.cpp
index 23b2452f6..dfafb32c8 100644
--- a/src/widgets/qtextbrowser.cpp
+++ b/src/widgets/tqtextbrowser.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqtextbrowser.h"
+#include "tqtextbrowser.h"
 #ifndef TQT_NO_TEXTBROWSER
 #include "../kernel/qrichtext_p.h"
 
@@ -49,7 +49,7 @@
 #include "tqvaluestack.h"
 #include "stdio.h"
 #include "ntqfile.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "ntqlayout.h"
 #include "ntqbitmap.h"
 #include "ntqtimer.h"
@@ -60,7 +60,7 @@
 #include "ntqcursor.h"
 
 /*!
-    \class TQTextBrowser ntqtextbrowser.h
+    \class TQTextBrowser tqtextbrowser.h
     \brief The TQTextBrowser class provides a rich text browser with hypertext navigation.
 
     \ingroup advanced
@@ -110,7 +110,7 @@
     editing. If you just need to display a small piece of rich text
     use TQSimpleRichText or TQLabel.
 
-    <img src=qtextbrowser-m.png> <img src=qtextbrowser-w.png>
+    <img src=tqtextbrowser-m.png> <img src=tqtextbrowser-w.png>
 */
 
 class TQTextBrowserData
diff --git a/src/widgets/ntqtextbrowser.h b/src/widgets/tqtextbrowser.h
index c9ac4ae9e..c68031ff1 100644
--- a/src/widgets/ntqtextbrowser.h
+++ b/src/widgets/tqtextbrowser.h
@@ -45,7 +45,7 @@
 #include "tqptrlist.h"
 #include "ntqpixmap.h"
 #include "ntqcolor.h"
-#include "ntqtextedit.h"
+#include "tqtextedit.h"
 #endif // QT_H
 
 #ifndef TQT_NO_TEXTBROWSER
diff --git a/src/widgets/qtextedit.cpp b/src/widgets/tqtextedit.cpp
index 0fb328bf9..a4cc6cf11 100644
--- a/src/widgets/qtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqtextedit.h"
+#include "tqtextedit.h"
 
 #ifndef TQT_NO_TEXTEDIT
 
@@ -73,7 +73,7 @@
 #include "ntqpopupmenu.h"
 #include "tqptrstack.h"
 #include "ntqmetaobject.h"
-#include "ntqtextbrowser.h"
+#include "tqtextbrowser.h"
 #include <private/qucom_p.h>
 #include "private/qsyntaxhighlighter_p.h"
 #include <ntqguardedptr.h>
@@ -213,7 +213,7 @@ const char* TQRichTextDrag::format( int i ) const
 static bool block_set_alignment = FALSE;
 
 /*!
-    \class TQTextEdit ntqtextedit.h
+    \class TQTextEdit tqtextedit.h
     \brief The TQTextEdit widget provides a powerful single-page rich text editor.
 
     \ingroup basic
@@ -1698,7 +1698,7 @@ void TQTextEdit::imEndEvent( TQIMEvent *e )
 }
 
 
-static bool qtextedit_ignore_readonly = FALSE;
+static bool tqtextedit_ignore_readonly = FALSE;
 
 /*!
     Executes keyboard action \a action. This is normally called by a
@@ -1707,7 +1707,7 @@ static bool qtextedit_ignore_readonly = FALSE;
 
 void TQTextEdit::doKeyboardAction( KeyboardAction action )
 {
-    if ( isReadOnly() && !qtextedit_ignore_readonly )
+    if ( isReadOnly() && !tqtextedit_ignore_readonly )
 	return;
 
     if ( cursor->nestedDepth() != 0 ) // #### for 3.0, disable editing of tables as this is not advanced enough
@@ -3213,14 +3213,14 @@ void TQTextEdit::insertParagraph( const TQString &text, int para )
     cursor->setParagraph( p );
     cursor->setIndex( 0 );
     clearUndoRedo();
-    qtextedit_ignore_readonly = TRUE;
+    tqtextedit_ignore_readonly = TRUE;
     if ( append && cursor->paragraph()->length() > 1 ) {
 	cursor->setIndex( cursor->paragraph()->length() - 1 );
 	doKeyboardAction( ActionReturn );
     }
     insert( text, FALSE, TRUE, TRUE );
     doKeyboardAction( ActionReturn );
-    qtextedit_ignore_readonly = FALSE;
+    tqtextedit_ignore_readonly = FALSE;
 
     drawCursor( FALSE );
     *cursor = old;
diff --git a/src/widgets/ntqtextedit.h b/src/widgets/tqtextedit.h
index 40906dbfc..40906dbfc 100644
--- a/src/widgets/ntqtextedit.h
+++ b/src/widgets/tqtextedit.h
diff --git a/src/widgets/qtextview.cpp b/src/widgets/tqtextview.cpp
index b672bee3d..a475d7b4a 100644
--- a/src/widgets/qtextview.cpp
+++ b/src/widgets/tqtextview.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqtextview.h"
+#include "tqtextview.h"
 
 #ifndef TQT_NO_TEXTVIEW
 
diff --git a/src/widgets/ntqtextview.h b/src/widgets/tqtextview.h
index 2d0d73cfe..8970d10c8 100644
--- a/src/widgets/ntqtextview.h
+++ b/src/widgets/tqtextview.h
@@ -42,7 +42,7 @@
 #define TQTEXTVIEW_H
 
 #ifndef QT_H
-#include "ntqtextedit.h"
+#include "tqtextedit.h"
 #endif // QT_H
 
 #ifndef TQT_NO_TEXTVIEW
diff --git a/src/xml/qsvgdevice.cpp b/src/xml/qsvgdevice.cpp
index d2895838f..852cc7424 100644
--- a/src/xml/qsvgdevice.cpp
+++ b/src/xml/qsvgdevice.cpp
@@ -46,7 +46,7 @@
 #include "tqmap.h"
 #include "ntqregexp.h"
 #include "tqvaluelist.h"
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "tqimage.h"
 #include "ntqpixmap.h"
 
diff --git a/src/xml/tqdom.cpp b/src/xml/tqdom.cpp
index 4feaf47a6..c233afa76 100644
--- a/src/xml/tqdom.cpp
+++ b/src/xml/tqdom.cpp
@@ -45,8 +45,8 @@
 #include "tqxml.h"
 #include "tqptrlist.h"
 #include "ntqdict.h"
-#include "ntqtextstream.h"
-#include "ntqtextcodec.h"
+#include "tqtextstream.h"
+#include "tqtextcodec.h"
 #include "ntqiodevice.h"
 #include "ntqregexp.h"
 #include "ntqbuffer.h"
diff --git a/src/xml/tqxml.cpp b/src/xml/tqxml.cpp
index 4a2b8615d..f9fa14b77 100644
--- a/src/xml/tqxml.cpp
+++ b/src/xml/tqxml.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "tqxml.h"
-#include "ntqtextcodec.h"
+#include "tqtextcodec.h"
 #include "ntqbuffer.h"
 #include "ntqregexp.h"
 #include "tqptrstack.h"
diff --git a/src/xml/tqxml.h b/src/xml/tqxml.h
index fb685a21e..d55004993 100644
--- a/src/xml/tqxml.h
+++ b/src/xml/tqxml.h
@@ -42,7 +42,7 @@
 #define TQXML_H
 
 #ifndef QT_H
-#include "ntqtextstream.h"
+#include "tqtextstream.h"
 #include "ntqfile.h"
 #include "tqstring.h"
 #include "tqstringlist.h"