7 files changed, 13 insertions, 13 deletions
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