45 files changed, 101 insertions, 101 deletions
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index 2d449fd9..64115edf 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -718,7 +718,7 @@ typedef TQ_UINT64		TQ_ULLONG;	// unsigned long long
 
 
 //
-// Data stream functions is provided by many classes (defined in ntqdatastream.h)
+// Data stream functions is provided by many classes (defined in tqdatastream.h)
 //
 
 class TQCString;
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index cc7647da..2d95ce54 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -40,8 +40,8 @@
 
 #ifndef TQT_NO_COMPONENT
 #include <ntqapplication.h>
-#include <ntqsettings.h>
-#include <ntqfileinfo.h>
+#include <tqsettings.h>
+#include <tqfileinfo.h>
 #include <tqdatetime.h>
 #include <ntqcleanuphandler.h>
 #ifndef NO_ERRNO_H
diff --git a/src/tools/qcomponentfactory.cpp b/src/tools/qcomponentfactory.cpp
index 12fe33e1..0186e784 100644
--- a/src/tools/qcomponentfactory.cpp
+++ b/src/tools/qcomponentfactory.cpp
@@ -41,9 +41,9 @@
 #include "qcomponentfactory_p.h"
 
 #ifndef TQT_NO_COMPONENT
-#include "ntqsettings.h"
+#include "tqsettings.h"
 #include <private/qcomlibrary_p.h>
-#include "ntqdir.h"
+#include "tqdir.h"
 #include "ntqapplication.h"
 
 /*!
diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt
index 6bf19b12..2d402752 100644
--- a/src/tools/qfeatures.txt
+++ b/src/tools/qfeatures.txt
@@ -182,7 +182,7 @@ SeeAlso: ???
 Feature: DIR
 Section: File I/O
 Requires: STRINGLIST REGEXP
-Name: QDir
+Name: TQDir
 SeeAlso: ???
 
 Feature: PALETTE
@@ -200,7 +200,7 @@ SeeAlso: ???
 Feature: DATASTREAM
 Section: File I/O
 Requires:
-Name: QDataStream
+Name: TQDataStream
 SeeAlso: ???
 
 Feature: LIBRARY
@@ -224,7 +224,7 @@ SeeAlso: ???
 Feature: SIGNALMAPPER
 Section: Widgets
 Requires:
-Name: QSignalMapper
+Name: TQSignalMapper
 SeeAlso: ???
 
 Feature: IMAGEIO
@@ -1006,7 +1006,7 @@ SeeAlso: ???
 Feature: FILEDIALOG
 Section: Widgets
 Requires: MESSAGEBOX LISTVIEW NETWORKPROTOCOL COMBOBOX DIALOG REGEXP_CAPTURE TOOLBUTTON BUTTONGROUP VBOX SPLITTER PROGRESSBAR WIDGETSTACK DATESTRING
-Name: QFileDialog
+Name: TQFileDialog
 SeeAlso: ???
 
 Feature: FONTDIALOG
diff --git a/src/tools/qgdict.cpp b/src/tools/qgdict.cpp
index 50d2816e..dd35d64e 100644
--- a/src/tools/qgdict.cpp
+++ b/src/tools/qgdict.cpp
@@ -41,7 +41,7 @@
 #include "ntqgdict.h"
 #include "tqptrlist.h"
 #include "tqstring.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include <ctype.h>
 
 /*!
diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp
index 95e66b38..7ffa66d4 100644
--- a/src/tools/qglist.cpp
+++ b/src/tools/qglist.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqglist.h"
 #include "ntqgvector.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "tqvaluelist.h"
 
 #if defined(TQT_THREAD_SUPPORT)
diff --git a/src/tools/qgpluginmanager.cpp b/src/tools/qgpluginmanager.cpp
index 3a7c321f..b2b5bf63 100644
--- a/src/tools/qgpluginmanager.cpp
+++ b/src/tools/qgpluginmanager.cpp
@@ -40,7 +40,7 @@
 #ifndef TQT_NO_COMPONENT
 #include "qcomlibrary_p.h"
 #include "tqmap.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 
 /*
   The following co-occurrence code is borrowed from TQt Linguist.
diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp
index 1c6c8669..03b502c0 100644
--- a/src/tools/qgvector.cpp
+++ b/src/tools/qgvector.cpp
@@ -48,7 +48,7 @@
 #include "ntqgvector.h"
 #include "ntqglist.h"
 #include "tqstring.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include <stdlib.h>
 
 #ifdef TQT_THREAD_SUPPORT
diff --git a/src/tools/qlibrary.cpp b/src/tools/qlibrary.cpp
index 002f3321..6b586fcd 100644
--- a/src/tools/qlibrary.cpp
+++ b/src/tools/qlibrary.cpp
@@ -41,7 +41,7 @@
 #include "qplatformdefs.h"
 #include <private/qlibrary_p.h>
 #include <tqstringlist.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 
 #ifndef TQT_NO_LIBRARY
 
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index dc9fa275..c4cced51 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -6,21 +6,21 @@ tools {
 		  $$TOOLS_H/tqasciicache.h \
 		  $$TOOLS_H/tqasciidict.h \
 		  $$TOOLS_H/tqbitarray.h \
-		  $$TOOLS_H/ntqbuffer.h \
+		  $$TOOLS_H/tqbuffer.h \
 		  $$TOOLS_H/tqcache.h \
 		  $$TOOLS_H/ntqcleanuphandler.h \
 		  $$TOOLS_P/qcomponentfactory_p.h \
 		  $$TOOLS_P/qcomlibrary_p.h \
 		  $$TOOLS_H/tqcstring.h \
-		  $$TOOLS_H/ntqdatastream.h \
+		  $$TOOLS_H/tqdatastream.h \
 		  $$TOOLS_H/tqdatetime.h \
 		  $$TOOLS_H/tqdeepcopy.h \
 		  $$TOOLS_H/tqdict.h \
-		  $$TOOLS_H/ntqdir.h \
-		  $$TOOLS_P/qdir_p.h \
-		  $$TOOLS_H/ntqfile.h \
-		  $$TOOLS_P/qfiledefs_p.h \
-		  $$TOOLS_H/ntqfileinfo.h \
+		  $$TOOLS_H/tqdir.h \
+		  $$TOOLS_P/tqdir_p.h \
+		  $$TOOLS_H/tqfile.h \
+		  $$TOOLS_P/tqfiledefs_p.h \
+		  $$TOOLS_H/tqfileinfo.h \
 		  $$TOOLS_H/ntqgarray.h \
 		  $$TOOLS_H/ntqgcache.h \
 		  $$TOOLS_H/ntqgdict.h \
@@ -31,7 +31,7 @@ tools {
 		  $$TOOLS_H/ntqgvector.h \
 		  $$TOOLS_H/tqintcache.h \
 		  $$TOOLS_H/tqintdict.h \
-		  $$TOOLS_H/ntqiodevice.h \
+		  $$TOOLS_H/tqiodevice.h \
 		  $$TOOLS_H/ntqlibrary.h \
 		  $$TOOLS_P/qlibrary_p.h \
 		  $$TOOLS_H/ntqlocale.h \
@@ -47,8 +47,8 @@ tools {
 		  $$TOOLS_H/tqptrqueue.h \
 		  $$TOOLS_H/tqregexp.h \
 		  $$TOOLS_H/tqsemaphore.h \
-		  $$TOOLS_H/ntqsettings.h \
-		  $$TOOLS_P/qsettings_p.h \
+		  $$TOOLS_H/tqsettings.h \
+		  $$TOOLS_P/tqsettings_p.h \
 		  $$TOOLS_H/ntqshared.h \
 		  $$TOOLS_H/tqptrstack.h \
 		  $$TOOLS_H/tqstring.h \
@@ -68,11 +68,11 @@ tools {
 		  $$TOOLS_P/qucom_p.h \
 		  $$TOOLS_H/ntquuid.h
 
-	win32:SOURCES += $$TOOLS_CPP/qdir_win.cpp \
-	 	  $$TOOLS_CPP/qfile_win.cpp \
-		  $$TOOLS_CPP/qfileinfo_win.cpp \
+	win32:SOURCES += $$TOOLS_CPP/tqdir_win.cpp \
+	 	  $$TOOLS_CPP/tqfile_win.cpp \
+		  $$TOOLS_CPP/tqfileinfo_win.cpp \
 		  $$TOOLS_CPP/qlibrary_win.cpp \
-		  $$TOOLS_CPP/qsettings_win.cpp \
+		  $$TOOLS_CPP/tqsettings_win.cpp \
 		  $$TOOLS_CPP/tqmutex_win.cpp \
 		  $$TOOLS_CPP/tqwaitcondition_win.cpp \
 		  $$TOOLS_CPP/tqthreadstorage_win.cpp \
@@ -81,25 +81,25 @@ tools {
 	win32-borland:SOURCES += $$TOOLS_CPP/qwinexport.cpp
 
 	wince-* {
-		SOURCES -= $$TOOLS_CPP/qdir_win.cpp \
-			   $$TOOLS_CPP/qfile_win.cpp \
-			   $$TOOLS_CPP/qfileinfo_win.cpp
-		SOURCES += $$TOOLS_CPP/qdir_wce.cpp \
-			   $$TOOLS_CPP/qfile_wce.cpp \
-			   $$TOOLS_CPP/qfileinfo_wce.cpp
+		SOURCES -= $$TOOLS_CPP/tqdir_win.cpp \
+			   $$TOOLS_CPP/tqfile_win.cpp \
+			   $$TOOLS_CPP/tqfileinfo_win.cpp
+		SOURCES += $$TOOLS_CPP/tqdir_wce.cpp \
+			   $$TOOLS_CPP/tqfile_wce.cpp \
+			   $$TOOLS_CPP/tqfileinfo_wce.cpp
 	}
 
-        offmac:SOURCES += $$TOOLS_CPP/qdir_mac.cpp \
-		  $$TOOLS_CPP/qfile_mac.cpp \
-		  $$TOOLS_CPP/qfileinfo_mac.cpp
-	else:unix:SOURCES += $$TOOLS_CPP/qdir_unix.cpp \
-		  $$TOOLS_CPP/qfile_unix.cpp \
-		  $$TOOLS_CPP/qfileinfo_unix.cpp \
+        offmac:SOURCES += $$TOOLS_CPP/tqdir_mac.cpp \
+		  $$TOOLS_CPP/tqfile_mac.cpp \
+		  $$TOOLS_CPP/tqfileinfo_mac.cpp
+	else:unix:SOURCES += $$TOOLS_CPP/tqdir_unix.cpp \
+		  $$TOOLS_CPP/tqfile_unix.cpp \
+		  $$TOOLS_CPP/tqfileinfo_unix.cpp \
 		  $$TOOLS_CPP/tqmutex_unix.cpp \
 		  $$TOOLS_CPP/tqthreadstorage_unix.cpp \
 		  $$TOOLS_CPP/tqwaitcondition_unix.cpp
 
-        mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/qsettings_mac.cpp
+        mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/tqsettings_mac.cpp
 	mac {
 		SOURCES+=3rdparty/dlcompat/dlfcn.c
 		INCLUDEPATH+=3rdparty/dlcompat
@@ -107,16 +107,16 @@ tools {
 	unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
 
 	SOURCES += $$TOOLS_CPP/tqbitarray.cpp \
-		  $$TOOLS_CPP/qbuffer.cpp \
+		  $$TOOLS_CPP/tqbuffer.cpp \
 		  $$TOOLS_CPP/qcomponentfactory.cpp \
 		  $$TOOLS_CPP/qcomlibrary.cpp \
 		  $$TOOLS_CPP/tqcstring.cpp \
-		  $$TOOLS_CPP/qdatastream.cpp \
+		  $$TOOLS_CPP/tqdatastream.cpp \
 		  $$TOOLS_CPP/tqdatetime.cpp \
 		  $$TOOLS_CPP/tqdeepcopy.cpp \
-		  $$TOOLS_CPP/qdir.cpp \
-		  $$TOOLS_CPP/qfile.cpp \
-		  $$TOOLS_CPP/qfileinfo.cpp \
+		  $$TOOLS_CPP/tqdir.cpp \
+		  $$TOOLS_CPP/tqfile.cpp \
+		  $$TOOLS_CPP/tqfileinfo.cpp \
 		  $$TOOLS_CPP/qgarray.cpp \
 		  $$TOOLS_CPP/qgcache.cpp \
 		  $$TOOLS_CPP/qgdict.cpp \
@@ -124,7 +124,7 @@ tools {
 		  $$TOOLS_CPP/qglobal.cpp \
 		  $$TOOLS_CPP/qgpluginmanager.cpp \
 		  $$TOOLS_CPP/qgvector.cpp \
-		  $$TOOLS_CPP/qiodevice.cpp \
+		  $$TOOLS_CPP/tqiodevice.cpp \
 		  $$TOOLS_CPP/qlibrary.cpp \
 		  $$TOOLS_CPP/qlocale.cpp \
 		  $$TOOLS_CPP/tqmap.cpp \
@@ -133,7 +133,7 @@ tools {
 		  $$TOOLS_CPP/tqregexp.cpp \
 		  $$TOOLS_CPP/tqstring.cpp \
 		  $$TOOLS_CPP/tqsemaphore.cpp \
-		  $$TOOLS_CPP/qsettings.cpp \
+		  $$TOOLS_CPP/tqsettings.cpp \
 		  $$TOOLS_CPP/tqstringlist.cpp \
 		  $$TOOLS_CPP/tqtextstream.cpp \
 		  $$TOOLS_CPP/qunicodetables.cpp \
diff --git a/src/tools/quuid.cpp b/src/tools/quuid.cpp
index 34b6e3db..b07eadd0 100644
--- a/src/tools/quuid.cpp
+++ b/src/tools/quuid.cpp
@@ -38,7 +38,7 @@
 
 #include "ntquuid.h"
 
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 /*!
     \class TQUuid ntquuid.h
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index cb5ce9c1..64422497 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/qwinexport.cpp
@@ -7,9 +7,9 @@
 #include <tqobject.h>
 #include <ntqpoint.h>
 #include <ntqrect.h>
-#include <ntqsignalslotimp.h>
+#include <tqsignalslotimp.h>
 #include <tqwidget.h>
-#include <ntqhttp.h>
+#include <tqhttp.h>
 #include <private/tqsqlextension_p.h>
 #include <tqsqlindex.h>
 #include <ntqtable.h>
diff --git a/src/tools/tqbitarray.cpp b/src/tools/tqbitarray.cpp
index 283a9940..5eb33b92 100644
--- a/src/tools/tqbitarray.cpp
+++ b/src/tools/tqbitarray.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "tqbitarray.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 #define SHBLOCK	 ((bitarr_data*)(sharedBlock()))
 
diff --git a/src/tools/qbuffer.cpp b/src/tools/tqbuffer.cpp
index b1707d78..827f5c18 100644
--- a/src/tools/qbuffer.cpp
+++ b/src/tools/tqbuffer.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include <stdlib.h>
 
 /*!
-    \class TQBuffer ntqbuffer.h
+    \class TQBuffer tqbuffer.h
     \reentrant
     \brief The TQBuffer class is an I/O device that operates on a TQByteArray.
 
diff --git a/src/tools/ntqbuffer.h b/src/tools/tqbuffer.h
index 66f84e86..ff589982 100644
--- a/src/tools/ntqbuffer.h
+++ b/src/tools/tqbuffer.h
@@ -42,7 +42,7 @@
 #define TQBUFFER_H
 
 #ifndef QT_H
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "tqstring.h"
 #endif // QT_H
 
diff --git a/src/tools/tqcstring.cpp b/src/tools/tqcstring.cpp
index d4af4641..8c09d227 100644
--- a/src/tools/tqcstring.cpp
+++ b/src/tools/tqcstring.cpp
@@ -41,7 +41,7 @@
 
 #include "tqstring.h"
 #include "tqregexp.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 #ifdef TQT_THREAD_SUPPORT
 #  include <private/tqmutexpool_p.h>
diff --git a/src/tools/qdatastream.cpp b/src/tools/tqdatastream.cpp
index d5b7162f..f2980a4e 100644
--- a/src/tools/qdatastream.cpp
+++ b/src/tools/tqdatastream.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 #ifndef TQT_NO_DATASTREAM
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -52,7 +52,7 @@
 #endif
 
 /*!
-    \class TQDataStream ntqdatastream.h
+    \class TQDataStream tqdatastream.h
     \reentrant
     \brief The TQDataStream class provides serialization of binary data
     to a TQIODevice.
diff --git a/src/tools/ntqdatastream.h b/src/tools/tqdatastream.h
index 2d406347..5111a2fb 100644
--- a/src/tools/ntqdatastream.h
+++ b/src/tools/tqdatastream.h
@@ -42,7 +42,7 @@
 #define TQDATASTREAM_H
 
 #ifndef QT_H
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "tqstring.h"
 #endif // QT_H
 
diff --git a/src/tools/tqdatetime.cpp b/src/tools/tqdatetime.cpp
index 5253fa50..49ae68bb 100644
--- a/src/tools/tqdatetime.cpp
+++ b/src/tools/tqdatetime.cpp
@@ -41,7 +41,7 @@
 #include "qplatformdefs.h"
 
 #include "tqdatetime.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "tqregexp.h"
 
 #include <stdio.h>
diff --git a/src/tools/qdir.cpp b/src/tools/tqdir.cpp
index 4ca6be4a..21bea6af 100644
--- a/src/tools/qdir.cpp
+++ b/src/tools/tqdir.cpp
@@ -39,11 +39,11 @@
 **********************************************************************/
 
 #include "qplatformdefs.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 
 #ifndef TQT_NO_DIR
-#include <private/qdir_p.h>
-#include "ntqfileinfo.h"
+#include <private/tqdir_p.h>
+#include "tqfileinfo.h"
 #include "tqregexp.h"
 #include "tqstringlist.h"
 #include "tqdeepcopy.h"
@@ -151,7 +151,7 @@ const bool CaseSensitiveFS = TRUE;
     (excluding symbolic links), sorted by size, smallest first:
     \code
     #include <stdio.h>
-    #include <ntqdir.h>
+    #include <tqdir.h>
 
     int main( int argc, char **argv )
     {
diff --git a/src/tools/ntqdir.h b/src/tools/tqdir.h
index 04bd409e..41ba93e8 100644
--- a/src/tools/ntqdir.h
+++ b/src/tools/tqdir.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqglobal.h"
 #include "tqstrlist.h"
-#include "ntqfileinfo.h"
+#include "tqfileinfo.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qdir_p.h b/src/tools/tqdir_p.h
index a0309648..d6c6fb2e 100644
--- a/src/tools/qdir_p.h
+++ b/src/tools/tqdir_p.h
@@ -46,7 +46,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qdir.cpp and qdir_*.cpp.
+// of tqdir.cpp and tqdir_*.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
diff --git a/src/tools/qdir_unix.cpp b/src/tools/tqdir_unix.cpp
index e4418f8e..3587a706 100644
--- a/src/tools/qdir_unix.cpp
+++ b/src/tools/tqdir_unix.cpp
@@ -39,12 +39,12 @@
 **********************************************************************/
 
 #include "qplatformdefs.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 
 #ifndef TQT_NO_DIR
 
-#include "qdir_p.h"
-#include "ntqfileinfo.h"
+#include "tqdir_p.h"
+#include "tqfileinfo.h"
 #include "tqregexp.h"
 #include "tqstringlist.h"
 
diff --git a/src/tools/qfile.cpp b/src/tools/tqfile.cpp
index d5dae9a7..06a127fc 100644
--- a/src/tools/qfile.cpp
+++ b/src/tools/tqfile.cpp
@@ -50,7 +50,7 @@
 # undef truncate
 #endif
 
-#include "ntqfile.h"
+#include "tqfile.h"
 #ifndef NO_ERRNO_H
 #include <errno.h>
 #endif
@@ -78,7 +78,7 @@ public:
 extern bool qt_file_access( const TQString& fn, int t );
 
 /*!
-    \class TQFile ntqfile.h
+    \class TQFile tqfile.h
     \reentrant
     \brief The TQFile class is an I/O device that operates on files.
 
diff --git a/src/tools/ntqfile.h b/src/tools/tqfile.h
index ba2d9e10..f40e1e58 100644
--- a/src/tools/ntqfile.h
+++ b/src/tools/tqfile.h
@@ -42,7 +42,7 @@
 #define TQFILE_H
 
 #ifndef QT_H
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "tqstring.h"
 #include <stdio.h>
 #endif // QT_H
diff --git a/src/tools/qfile_unix.cpp b/src/tools/tqfile_unix.cpp
index f2889948..a56466cd 100644
--- a/src/tools/qfile_unix.cpp
+++ b/src/tools/tqfile_unix.cpp
@@ -52,7 +52,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 # undef truncate
 #endif
 
-#include "ntqfile.h"
+#include "tqfile.h"
 #include <errno.h>
 #include <limits.h>
 
diff --git a/src/tools/qfiledefs_p.h b/src/tools/tqfiledefs_p.h
index 62d55583..83f84d47 100644
--- a/src/tools/qfiledefs_p.h
+++ b/src/tools/tqfiledefs_p.h
@@ -46,7 +46,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qfileinfo*.cpp.  This header file may change from version to version
+// of tqfileinfo*.cpp.  This header file may change from version to version
 // without notice, or even be removed.
 //
 // We mean it.
diff --git a/src/tools/qfileinfo.cpp b/src/tools/tqfileinfo.cpp
index 60a39346..e9ba9568 100644
--- a/src/tools/qfileinfo.cpp
+++ b/src/tools/tqfileinfo.cpp
@@ -40,10 +40,10 @@
 
 #include "qplatformdefs.h"
 
-#include "ntqfileinfo.h"
+#include "tqfileinfo.h"
 #include "tqdatetime.h"
-#include "ntqdir.h"
-#include "qfiledefs_p.h"
+#include "tqdir.h"
+#include "tqfiledefs_p.h"
 #include "tqdeepcopy.h"
 #if defined(QT_LARGEFILE_SUPPORT)
 #include <limits.h>
diff --git a/src/tools/ntqfileinfo.h b/src/tools/tqfileinfo.h
index 3c4e3b3a..41a76448 100644
--- a/src/tools/ntqfileinfo.h
+++ b/src/tools/tqfileinfo.h
@@ -42,7 +42,7 @@
 #define TQFILEINFO_H
 
 #ifndef QT_H
-#include "ntqfile.h"
+#include "tqfile.h"
 #include "tqdatetime.h"
 #endif // QT_H
 
diff --git a/src/tools/qfileinfo_unix.cpp b/src/tools/tqfileinfo_unix.cpp
index 159b43ae..300515e3 100644
--- a/src/tools/qfileinfo_unix.cpp
+++ b/src/tools/tqfileinfo_unix.cpp
@@ -39,10 +39,10 @@
 **********************************************************************/
 
 #include "qplatformdefs.h"
-#include "ntqfileinfo.h"
-#include "qfiledefs_p.h"
+#include "tqfileinfo.h"
+#include "tqfiledefs_p.h"
 #include "tqdatetime.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 
 #include <limits.h>
 #if defined(Q_OS_MAC)
diff --git a/src/tools/qiodevice.cpp b/src/tools/tqiodevice.cpp
index cf069aa2..014a18d4 100644
--- a/src/tools/qiodevice.cpp
+++ b/src/tools/tqiodevice.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 
 /*!
-    \class TQIODevice ntqiodevice.h
+    \class TQIODevice tqiodevice.h
     \reentrant
 
     \brief The TQIODevice class is the base class of I/O devices.
diff --git a/src/tools/ntqiodevice.h b/src/tools/tqiodevice.h
index 712288d8..712288d8 100644
--- a/src/tools/ntqiodevice.h
+++ b/src/tools/tqiodevice.h
diff --git a/src/tools/tqmap.h b/src/tools/tqmap.h
index 97a21883..a173e757 100644
--- a/src/tools/tqmap.h
+++ b/src/tools/tqmap.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqglobal.h"
 #include "ntqshared.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "tqpair.h"
 #include "tqvaluelist.h"
 #endif // QT_H
diff --git a/src/tools/tqpair.h b/src/tools/tqpair.h
index cd161468..5b197d8d 100644
--- a/src/tools/tqpair.h
+++ b/src/tools/tqpair.h
@@ -42,7 +42,7 @@
 
 #ifndef QT_H
 #include "ntqglobal.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #endif // QT_H
 
 template <class T1, class T2>
diff --git a/src/tools/qsettings.cpp b/src/tools/tqsettings.cpp
index e76fc6ca..a2ef55da 100644
--- a/src/tools/qsettings.cpp
+++ b/src/tools/tqsettings.cpp
@@ -53,17 +53,17 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
 # undef truncate
 #endif
 
-#include "ntqsettings.h"
+#include "tqsettings.h"
 
 #ifndef TQT_NO_SETTINGS
 
-#include "ntqdir.h"
-#include "ntqfile.h"
-#include "ntqfileinfo.h"
+#include "tqdir.h"
+#include "tqfile.h"
+#include "tqfileinfo.h"
 #include "tqmap.h"
 #include "tqtextstream.h"
 #include "tqregexp.h"
-#include <private/qsettings_p.h>
+#include <private/tqsettings_p.h>
 #ifndef NO_ERRNO_H
 #include <errno.h>
 #endif
@@ -1995,7 +1995,7 @@ TQStringList TQSettings::readListEntry(const TQString &key, bool *ok )
 }
 
 #ifdef Q_OS_MAC
-void qt_setSettingsBasePath(const TQString &); //qsettings_mac.cpp
+void qt_setSettingsBasePath(const TQString &); //tqsettings_mac.cpp
 #endif
 
 /*!
diff --git a/src/tools/ntqsettings.h b/src/tools/tqsettings.h
index ee8e8e3b..ee8e8e3b 100644
--- a/src/tools/ntqsettings.h
+++ b/src/tools/tqsettings.h
diff --git a/src/tools/qsettings_p.h b/src/tools/tqsettings_p.h
index 75318492..75318492 100644
--- a/src/tools/qsettings_p.h
+++ b/src/tools/tqsettings_p.h
diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp
index 86b1add5..58a377cd 100644
--- a/src/tools/tqstring.cpp
+++ b/src/tools/tqstring.cpp
@@ -52,7 +52,7 @@
 
 #include "tqstring.h"
 #include "tqregexp.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #ifndef TQT_NO_TEXTCODEC
 #include "tqtextcodec.h"
 #endif
diff --git a/src/tools/tqstringlist.cpp b/src/tools/tqstringlist.cpp
index 8e08a4f0..43637c20 100644
--- a/src/tools/tqstringlist.cpp
+++ b/src/tools/tqstringlist.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_STRINGLIST
 #include "tqregexp.h"
 #include "tqstrlist.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqtl.h"
 
 /*!
diff --git a/src/tools/tqstrlist.h b/src/tools/tqstrlist.h
index 4bbcc2ca..2815b609 100644
--- a/src/tools/tqstrlist.h
+++ b/src/tools/tqstrlist.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqstring.h"
 #include "tqptrlist.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #endif // QT_H
 
 #if defined(Q_QDOC)
diff --git a/src/tools/tqstrvec.h b/src/tools/tqstrvec.h
index d80bfb97..2490c828 100644
--- a/src/tools/tqstrvec.h
+++ b/src/tools/tqstrvec.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqstring.h"
 #include "tqptrvector.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #endif // QT_H
 
 class TQ_EXPORT TQStrVec : public TQPtrVector<char>
diff --git a/src/tools/tqtextstream.cpp b/src/tools/tqtextstream.cpp
index 0a911b0e..20f6301e 100644
--- a/src/tools/tqtextstream.cpp
+++ b/src/tools/tqtextstream.cpp
@@ -43,8 +43,8 @@
 #ifndef TQT_NO_TEXTSTREAM
 #include "tqtextcodec.h"
 #include "tqregexp.h"
-#include "ntqbuffer.h"
-#include "ntqfile.h"
+#include "tqbuffer.h"
+#include "tqfile.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/src/tools/tqtextstream.h b/src/tools/tqtextstream.h
index ab2366b3..acfea970 100644
--- a/src/tools/tqtextstream.h
+++ b/src/tools/tqtextstream.h
@@ -42,7 +42,7 @@
 #define TQTEXTSTREAM_H
 
 #ifndef QT_H
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "tqstring.h"
 #include <stdio.h>
 #endif // QT_H
diff --git a/src/tools/tqvaluelist.h b/src/tools/tqvaluelist.h
index 4056290d..8a5bcb84 100644
--- a/src/tools/tqvaluelist.h
+++ b/src/tools/tqvaluelist.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqtl.h"
 #include "ntqshared.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #endif // QT_H
 
 #ifndef TQT_NO_STL
diff --git a/src/tools/tqvaluevector.h b/src/tools/tqvaluevector.h
index 90dc45e1..fd45bce8 100644
--- a/src/tools/tqvaluevector.h
+++ b/src/tools/tqvaluevector.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqtl.h"
 #include "ntqshared.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #endif // QT_H
 
 #ifndef TQT_NO_STL