Rename remaining ntq[s-z]* related files to equivalent tq*

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

115 files changed, 169 insertions, 169 deletions

diff --git a/src/canvas/tqcanvas.cpp b/src/canvas/tqcanvas.cpp
index 2958a50f2..d784553e4 100644
--- a/src/canvas/tqcanvas.cpp
+++ b/src/canvas/tqcanvas.cpp
@@ -47,7 +47,7 @@
 #include "tqpainter.h"
 #include "tqpolygonscanner.h"
 #include "tqtimer.h"
-#include "ntqtl.h"
+#include "tqtl.h"
 
 #include <stdlib.h>
 
diff --git a/src/canvas/tqcanvas.h b/src/canvas/tqcanvas.h
index c8c8fe18d..a33c6e9df 100644
--- a/src/canvas/tqcanvas.h
+++ b/src/canvas/tqcanvas.h
@@ -810,7 +810,7 @@ private:
 };
 
 #define Q_DEFINED_QCANVAS
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQT_NO_CANVAS
 
 #endif // TQCANVAS_H
diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp
index 9937f69a7..23a6d7f12 100644
--- a/src/dialogs/tqfiledialog.cpp
+++ b/src/dialogs/tqfiledialog.cpp
@@ -85,7 +85,7 @@
 #include "tqptrvector.h"
 #include "tqpushbutton.h"
 #include "tqregexp.h"
-#include "ntqsplitter.h"
+#include "tqsplitter.h"
 #include "tqstrlist.h"
 #include "tqstyle.h"
 #include "tqtimer.h"
diff --git a/src/dialogs/tqfontdialog.cpp b/src/dialogs/tqfontdialog.cpp
index e16148a7b..0fb122cee 100644
--- a/src/dialogs/tqfontdialog.cpp
+++ b/src/dialogs/tqfontdialog.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 
 #ifndef TQT_NO_FONTDIALOG
 
diff --git a/src/dialogs/tqfontdialog.h b/src/dialogs/tqfontdialog.h
index 1a3b007d5..bb19b7676 100644
--- a/src/dialogs/tqfontdialog.h
+++ b/src/dialogs/tqfontdialog.h
@@ -41,7 +41,7 @@
 #ifndef TQFONTDIALOG_H
 #define TQFONTDIALOG_H
 
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 
 #ifndef TQT_NO_FONTDIALOG
 
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 8ad7f5a55..db0fa0278 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -282,7 +282,7 @@
   a non-GUI server and a GUI client.
 
   \headerfile tqnamespace.h
-  \headerfile ntqwindowdefs.h
+  \headerfile tqwindowdefs.h
   \headerfile tqglobal.h
 */
 
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index d3e214b06..315b931fd 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -74,7 +74,7 @@ kernel {
 		  $$KERNEL_H/tqsizegrip.h \
 		  $$KERNEL_H/tqsizepolicy.h \
 		  $$KERNEL_H/tqsocketnotifier.h \
-		  $$KERNEL_H/ntqsound.h \
+		  $$KERNEL_H/tqsound.h \
 		  $$KERNEL_H/tqstyle.h \
 		  $$KERNEL_H/tqstylesheet.h \
 		  $$KERNEL_H/tqthread.h \
@@ -86,9 +86,9 @@ kernel {
 		  $$KERNEL_H/tqwidget.h \
 		  $$KERNEL_H/tqwidgetintdict.h \
 		  $$KERNEL_H/tqwidgetlist.h \
-		  $$KERNEL_H/ntqwindowdefs.h \
+		  $$KERNEL_H/tqwindowdefs.h \
 		  $$KERNEL_H/tqwmatrix.h \
-		  $$KERNEL_H/ntqvariant.h \
+		  $$KERNEL_H/tqvariant.h \
 		  $$KERNEL_P/qrichtext_p.h \
 		  $$KERNEL_P/qinternal_p.h \
 		  $$KERNEL_H/tqgplugin.h \
@@ -126,7 +126,7 @@ kernel {
 		  $$KERNEL_CPP/tqpaintdevice_win.cpp \
 		  $$KERNEL_CPP/tqpainter_win.cpp \
 		  $$KERNEL_CPP/tqregion_win.cpp \
-		  $$KERNEL_CPP/qsound_win.cpp \
+		  $$KERNEL_CPP/tqsound_win.cpp \
 		  $$KERNEL_CPP/tqthread_win.cpp \
 		  $$KERNEL_CPP/tqwidget_win.cpp \
 		  $$KERNEL_CPP/qole_win.c \
@@ -147,7 +147,7 @@ kernel {
 			  $$KERNEL_CPP/tqpaintdevice_x11.cpp \
 			  $$KERNEL_CPP/tqpainter_x11.cpp \
 			  $$KERNEL_CPP/tqregion_x11.cpp \
-			  $$KERNEL_CPP/qsound_x11.cpp \
+			  $$KERNEL_CPP/tqsound_x11.cpp \
 			  $$KERNEL_CPP/tqwidget_x11.cpp \
 			  $$KERNEL_CPP/tqwidgetcreate_x11.cpp \
 		          $$KERNEL_CPP/tqfontengine_x11.cpp
@@ -160,7 +160,7 @@ kernel {
 	}
 
 	!x11:mac {
-	    exists(qsound_mac.cpp):SOURCES += $$KERNEL_CPP/qsound_mac.cpp
+	    exists(tqsound_mac.cpp):SOURCES += $$KERNEL_CPP/tqsound_mac.cpp
 	}
         !embedded:!x11:mac {
 	      SOURCES += $$KERNEL_CPP/qapplication_mac.cpp \
@@ -246,7 +246,7 @@ kernel {
 		  $$KERNEL_CPP/tqsizegrip.cpp \
 		  $$KERNEL_CPP/tqstyle.cpp \
 		  $$KERNEL_CPP/tqsocketnotifier.cpp \
-		  $$KERNEL_CPP/qsound.cpp \
+		  $$KERNEL_CPP/tqsound.cpp \
 		  $$KERNEL_CPP/tqstylesheet.cpp \
 		  $$KERNEL_CPP/tqthread.cpp \
 		  $$KERNEL_CPP/tqtimer.cpp \
@@ -256,7 +256,7 @@ kernel {
 		  $$KERNEL_CPP/tqurlinfo.cpp \
 		  $$KERNEL_CPP/tqwidget.cpp \
 		  $$KERNEL_CPP/tqwmatrix.cpp \
-		  $$KERNEL_CPP/qvariant.cpp \
+		  $$KERNEL_CPP/tqvariant.cpp \
 		  $$KERNEL_CPP/qrichtext.cpp \
 		  $$KERNEL_CPP/qinternal.cpp \
 		  $$KERNEL_CPP/qrichtext_p.cpp \
diff --git a/src/kernel/qt_x11_p.h b/src/kernel/qt_x11_p.h
index df8a65754..23bdb7eaa 100644
--- a/src/kernel/qt_x11_p.h
+++ b/src/kernel/qt_x11_p.h
@@ -54,7 +54,7 @@
 
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #endif // QT_H
 
 // the following is necessary to work around breakage in many versions
diff --git a/src/kernel/qucomextra.cpp b/src/kernel/qucomextra.cpp
index 53af84dee..4e0de283c 100644
--- a/src/kernel/qucomextra.cpp
+++ b/src/kernel/qucomextra.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "qucomextra_p.h"
-#include <ntqvariant.h>
+#include <tqvariant.h>
 
 
 #ifndef TQT_NO_VARIANT
diff --git a/src/kernel/tqaccessible.h b/src/kernel/tqaccessible.h
index 25b12077e..ead26b9b0 100644
--- a/src/kernel/tqaccessible.h
+++ b/src/kernel/tqaccessible.h
@@ -289,7 +289,7 @@ private:
 };
 
 #define Q_DEFINED_QACCESSIBLE_OBJECT
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif //QT_ACCESSIBILITY_SUPPORT
 
 #endif //TQACCESSIBLE_H
diff --git a/src/kernel/tqbrush.h b/src/kernel/tqbrush.h
index 6ec4424e6..dc32bb14b 100644
--- a/src/kernel/tqbrush.h
+++ b/src/kernel/tqbrush.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqcolor.h"
-#include "ntqshared.h"
+#include "tqshared.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/tqclipboard.h b/src/kernel/tqclipboard.h
index 0202f78de..32d715bb3 100644
--- a/src/kernel/tqclipboard.h
+++ b/src/kernel/tqclipboard.h
@@ -42,7 +42,7 @@
 #define TQCLIPBOARD_H
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "tqobject.h"
 #endif // QT_H
 
diff --git a/src/kernel/tqcolor.h b/src/kernel/tqcolor.h
index 0fca55097..96bb758bd 100644
--- a/src/kernel/tqcolor.h
+++ b/src/kernel/tqcolor.h
@@ -42,7 +42,7 @@
 #define TQCOLOR_H
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "tqstringlist.h"
 #endif // QT_H
 
diff --git a/src/kernel/tqconnection.h b/src/kernel/tqconnection.h
index 6906184b7..6b769484f 100644
--- a/src/kernel/tqconnection.h
+++ b/src/kernel/tqconnection.h
@@ -74,5 +74,5 @@ private:	// Disabled copy constructor and operator=
 };
 
 #define Q_DEFINED_QCONNECTION
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQCONNECTION_H
diff --git a/src/kernel/tqcursor.h b/src/kernel/tqcursor.h
index aeb36d2f0..9ff7d1b70 100644
--- a/src/kernel/tqcursor.h
+++ b/src/kernel/tqcursor.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqpoint.h"
-#include "ntqshared.h"
+#include "tqshared.h"
 #endif // QT_H
 
 /*
diff --git a/src/kernel/tqevent.h b/src/kernel/tqevent.h
index fc229f9ab..6011dd35e 100644
--- a/src/kernel/tqevent.h
+++ b/src/kernel/tqevent.h
@@ -42,7 +42,7 @@
 #define TQEVENT_H
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "tqregion.h"
 #include "tqnamespace.h"
 #include "tqmime.h"
diff --git a/src/kernel/tqeventloop_glib_p.h b/src/kernel/tqeventloop_glib_p.h
index b9a75241a..45c6a1bfc 100644
--- a/src/kernel/tqeventloop_glib_p.h
+++ b/src/kernel/tqeventloop_glib_p.h
@@ -55,7 +55,7 @@
 #endif
 
 #include "tqeventloop.h"
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 
 class TQSocketNotifier;
 
diff --git a/src/kernel/tqeventloop_p.h b/src/kernel/tqeventloop_p.h
index f28cf1214..46e5fae9e 100644
--- a/src/kernel/tqeventloop_p.h
+++ b/src/kernel/tqeventloop_p.h
@@ -62,7 +62,7 @@
 # undef raise
 #endif
 
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 
 class TQSocketNotifier;
 #ifdef Q_OS_MAC
diff --git a/src/kernel/tqfont.h b/src/kernel/tqfont.h
index 43256972b..27f5269e2 100644
--- a/src/kernel/tqfont.h
+++ b/src/kernel/tqfont.h
@@ -42,7 +42,7 @@
 #define TQFONT_H
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "tqstring.h"
 #endif // QT_H
 
diff --git a/src/kernel/tqfontdatabase.cpp b/src/kernel/tqfontdatabase.cpp
index 36bcfcfef..33f10900f 100644
--- a/src/kernel/tqfontdatabase.cpp
+++ b/src/kernel/tqfontdatabase.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_FONTDATABASE
 
-#include <ntqtl.h>
+#include <tqtl.h>
 #include <ntqapplication.h>
 
 #include <private/qunicodetables_p.h>
diff --git a/src/kernel/tqfontdatabase.h b/src/kernel/tqfontdatabase.h
index 4a5e5c532..cb18ac6ed 100644
--- a/src/kernel/tqfontdatabase.h
+++ b/src/kernel/tqfontdatabase.h
@@ -42,7 +42,7 @@
 #define TQFONTDATABASE_H
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "tqstring.h"
 #include "tqstringlist.h"
 #include "tqfont.h"
diff --git a/src/kernel/tqguardedptr.h b/src/kernel/tqguardedptr.h
index 29ef8b8c7..e31d6f0c2 100644
--- a/src/kernel/tqguardedptr.h
+++ b/src/kernel/tqguardedptr.h
@@ -140,5 +140,5 @@ inline TQObject* TQGuardedPtrPrivate::object() const
 }
 
 #define Q_DEFINED_QGUARDEDPTR
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif
diff --git a/src/kernel/tqinputcontext_p.h b/src/kernel/tqinputcontext_p.h
index 37ba52b6c..e7b94e9cc 100644
--- a/src/kernel/tqinputcontext_p.h
+++ b/src/kernel/tqinputcontext_p.h
@@ -62,7 +62,7 @@ class TQString;
 
 #ifdef TQ_WS_X11
 #include "tqmemarray.h"
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "qt_x11_p.h"
 #endif
 
diff --git a/src/kernel/tqkeysequence.cpp b/src/kernel/tqkeysequence.cpp
index 88ea36bd5..659057784 100644
--- a/src/kernel/tqkeysequence.cpp
+++ b/src/kernel/tqkeysequence.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_ACCEL
 
 #include "tqaccel.h"
-#include "ntqshared.h"
+#include "tqshared.h"
 #include "tqvaluelist.h"
 #ifndef TQT_NO_REGEXP
 # include "tqregexp.h"
diff --git a/src/kernel/tqlayoutengine_p.h b/src/kernel/tqlayoutengine_p.h
index fd34dc73b..efb1295e8 100644
--- a/src/kernel/tqlayoutengine_p.h
+++ b/src/kernel/tqlayoutengine_p.h
@@ -50,7 +50,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of tqlayout.cpp, tqlayoutengine.cpp, tqmainwindow.cpp and qsplitter.cpp.
+// of tqlayout.cpp, tqlayoutengine.cpp, tqmainwindow.cpp and tqsplitter.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
diff --git a/src/kernel/tqmime.h b/src/kernel/tqmime.h
index 00c31a375..61420684e 100644
--- a/src/kernel/tqmime.h
+++ b/src/kernel/tqmime.h
@@ -42,7 +42,7 @@
 #define TQMIME_H
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "tqmap.h"
 #endif // QT_H
 
diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp
index cb1dfe7ab..1e376c21e 100644
--- a/src/kernel/tqobject.cpp
+++ b/src/kernel/tqobject.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqvariant.h"
+#include "tqvariant.h"
 #include "ntqapplication.h"
 #include "tqobject.h"
 #include "tqobjectlist.h"
diff --git a/src/kernel/tqobject.h b/src/kernel/tqobject.h
index eb627831d..bb260b19f 100644
--- a/src/kernel/tqobject.h
+++ b/src/kernel/tqobject.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqobjectdefs.h"
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "tqstring.h"
 #include "tqevent.h"
 #include "tqmutex.h"
@@ -288,5 +288,5 @@ inline TQString TQObject::trUtf8( const char *sourceText, const char * ) {
 
 
 #define Q_DEFINED_QOBJECT
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQOBJECT_H
diff --git a/src/kernel/tqpaintdevice.h b/src/kernel/tqpaintdevice.h
index 9e6cc6697..a846f6911 100644
--- a/src/kernel/tqpaintdevice.h
+++ b/src/kernel/tqpaintdevice.h
@@ -42,7 +42,7 @@
 #define TQPAINTDEVICE_H
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "tqrect.h"
 #endif // QT_H
 
diff --git a/src/kernel/tqpaintdevice_x11.cpp b/src/kernel/tqpaintdevice_x11.cpp
index 7bfbdf239..5a1ce8302 100644
--- a/src/kernel/tqpaintdevice_x11.cpp
+++ b/src/kernel/tqpaintdevice_x11.cpp
@@ -271,7 +271,7 @@ TQPaintDeviceX11Data* TQPaintDevice::getX11Data( bool def ) const
     low-level access. Using this function is not portable.
 
     The HANDLE type varies with platform; see \c tqpaintdevice.h and
-    \c ntqwindowdefs.h for details.
+    \c tqwindowdefs.h for details.
 
     \sa x11Display()
 */
diff --git a/src/kernel/tqpalette.h b/src/kernel/tqpalette.h
index 9f0ca13f0..8eaaf264a 100644
--- a/src/kernel/tqpalette.h
+++ b/src/kernel/tqpalette.h
@@ -42,9 +42,9 @@
 #define TQPALETTE_H
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "tqcolor.h"
-#include "ntqshared.h"
+#include "tqshared.h"
 #include "tqbrush.h" // TQColor->TQBrush conversion
 #endif // QT_H
 
diff --git a/src/kernel/tqpen.h b/src/kernel/tqpen.h
index 3a0a0f8d0..687b6d486 100644
--- a/src/kernel/tqpen.h
+++ b/src/kernel/tqpen.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqcolor.h"
-#include "ntqshared.h"
+#include "tqshared.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/tqpoint.h b/src/kernel/tqpoint.h
index c38e379b2..7ca714888 100644
--- a/src/kernel/tqpoint.h
+++ b/src/kernel/tqpoint.h
@@ -42,7 +42,7 @@
 #define TQPOINT_H
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #endif // QT_H
 
 
@@ -215,5 +215,5 @@ inline const TQPoint operator/( const TQPoint &p, double c )
 }
 
 #define Q_DEFINED_QPOINT
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQPOINT_H
diff --git a/src/kernel/tqprinter_p.h b/src/kernel/tqprinter_p.h
index a9e46a9f3..84f805574 100644
--- a/src/kernel/tqprinter_p.h
+++ b/src/kernel/tqprinter_p.h
@@ -44,7 +44,7 @@
 
 #ifndef QT_H
 #include <tqprinter.h>
-#include <ntqshared.h>
+#include <tqshared.h>
 #include <tqstring.h>
 #include <tqsize.h>
 #endif // QT_H
diff --git a/src/kernel/tqrect.cpp b/src/kernel/tqrect.cpp
index 9e45f1fab..0af8a22cb 100644
--- a/src/kernel/tqrect.cpp
+++ b/src/kernel/tqrect.cpp
@@ -54,7 +54,7 @@
     a bottom-right corner, but it is normally expressed as an
     upper-left corner and a size.
 
-    The coordinate type is TQCOORD (defined in \c ntqwindowdefs.h as \c
+    The coordinate type is TQCOORD (defined in \c tqwindowdefs.h as \c
     int). The minimum value of TQCOORD is TQCOORD_MIN (-2147483648) and
     the maximum value is  TQCOORD_MAX (2147483647).
 
diff --git a/src/kernel/tqrect.h b/src/kernel/tqrect.h
index d7dd2886b..1b66b1834 100644
--- a/src/kernel/tqrect.h
+++ b/src/kernel/tqrect.h
@@ -272,5 +272,5 @@ inline bool TQRect::contains( int x, int y ) const
 	   y >= y1 && y <= y2;
 }
 #define Q_DEFINED_QRECT
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQRECT_H
diff --git a/src/kernel/tqregion.h b/src/kernel/tqregion.h
index 51b3ac9b1..e8590cbdb 100644
--- a/src/kernel/tqregion.h
+++ b/src/kernel/tqregion.h
@@ -42,7 +42,7 @@
 #define TQREGION_H
 
 #ifndef QT_H
-#include "ntqshared.h"
+#include "tqshared.h"
 #include "tqrect.h"
 #endif // QT_H
 
diff --git a/src/kernel/tqsessionmanager.h b/src/kernel/tqsessionmanager.h
index ae79dd30b..696d79979 100644
--- a/src/kernel/tqsessionmanager.h
+++ b/src/kernel/tqsessionmanager.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "tqstring.h"
 #include "tqstringlist.h"
 #endif // QT_H
diff --git a/src/kernel/tqsignal.h b/src/kernel/tqsignal.h
index bb3875a09..116081362 100644
--- a/src/kernel/tqsignal.h
+++ b/src/kernel/tqsignal.h
@@ -42,7 +42,7 @@
 #define TQSIGNAL_H
 
 #ifndef QT_H
-#include "ntqvariant.h"
+#include "tqvariant.h"
 #include "tqobject.h"
 #endif // QT_H
 
diff --git a/src/kernel/tqsignalslotimp.h b/src/kernel/tqsignalslotimp.h
index e7e67a280..7b170fd18 100644
--- a/src/kernel/tqsignalslotimp.h
+++ b/src/kernel/tqsignalslotimp.h
@@ -93,5 +93,5 @@ public:
 };
 
 #define Q_DEFINED_QCONNECTION_LIST
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQSIGNALSLOTIMP_H
diff --git a/src/kernel/tqsize.cpp b/src/kernel/tqsize.cpp
index f35ad18a5..8a302eaa6 100644
--- a/src/kernel/tqsize.cpp
+++ b/src/kernel/tqsize.cpp
@@ -51,7 +51,7 @@
 
   A size is specified by a width and a height.
 
-  The coordinate type is TQCOORD (defined in \c <ntqwindowdefs.h> as \c int).
+  The coordinate type is TQCOORD (defined in \c <tqwindowdefs.h> as \c int).
   The minimum value of TQCOORD is TQCOORD_MIN (-2147483648) and the maximum
   value is TQCOORD_MAX (2147483647).
 
diff --git a/src/kernel/tqsize.h b/src/kernel/tqsize.h
index a49dd25a9..20c844dea 100644
--- a/src/kernel/tqsize.h
+++ b/src/kernel/tqsize.h
@@ -42,7 +42,7 @@
 #define TQSIZE_H
 
 #ifndef QT_H
-#include "tqpoint.h" // ### change to ntqwindowdefs.h?
+#include "tqpoint.h" // ### change to tqwindowdefs.h?
 #endif // QT_H
 
 class TQ_EXPORT TQSize
diff --git a/src/kernel/qsound.cpp b/src/kernel/tqsound.cpp
index 3141fc2b5..c5c64300f 100644
--- a/src/kernel/qsound.cpp
+++ b/src/kernel/tqsound.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsound.h"
+#include "tqsound.h"
 
 #ifndef TQT_NO_SOUND
 
@@ -98,7 +98,7 @@ public:
 };
 
 /*!
-    \class TQSound ntqsound.h
+    \class TQSound tqsound.h
     \brief The TQSound class provides access to the platform audio facilities.
 
     \ingroup multimedia
diff --git a/src/kernel/ntqsound.h b/src/kernel/tqsound.h
index d3ba92ed3..d3ba92ed3 100644
--- a/src/kernel/ntqsound.h
+++ b/src/kernel/tqsound.h
diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/tqsound_x11.cpp
index ea0d8f212..bbdbf5b44 100644
--- a/src/kernel/qsound_x11.cpp
+++ b/src/kernel/tqsound_x11.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsound.h"
+#include "tqsound.h"
 
 #ifndef TQT_NO_SOUND
 
@@ -244,7 +244,7 @@ void TQAuServerNAS::dataReceived()
     AuHandleEvents(nas);
 }
 
-#include "qsound_x11.moc"
+#include "tqsound_x11.moc"
 
 #endif
 
diff --git a/src/kernel/ntqt.h b/src/kernel/tqt3.h
index 7032b7383..8a04bdf30 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/tqt3.h
@@ -17,7 +17,7 @@
 #define QT_H
 #include "tqglobal.h"
 #include "tqfeatures.h"
-#include "ntqshared.h"
+#include "tqshared.h"
 #include "tqptrcollection.h"
 #include "tqglist.h"
 #include "tqobjectdefs.h"
@@ -29,7 +29,7 @@
 #include "tqptrlist.h"
 #include "tqiodevice.h"
 #include "tqkeysequence.h"
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "tqgdict.h"
 #include "tqfont.h"
 #include "tqdatastream.h"
@@ -39,7 +39,7 @@
 #include "tqtextstream.h"
 #include "tqfontinfo.h"
 #include "tqsizepolicy.h"
-#include "ntqtl.h"
+#include "tqtl.h"
 #include "tqsize.h"
 #include "tqrect.h"
 #include "tqbitarray.h"
@@ -127,7 +127,7 @@
 #include "tqwindowsstyle.h"
 #include "tqconnection.h"
 #include "tqbitmap.h"
-#include "ntqvariant.h"
+#include "tqvariant.h"
 #include "tqsignal.h"
 #include <tqmessagebox.h>
 #include "tqmetaobject.h"
@@ -196,10 +196,10 @@
 #include <tqsocket.h>
 #include <tqserversocket.h>
 #include <tqdns.h>
-#include <ntqsound.h>
+#include <tqsound.h>
 #include <tqspinbox.h>
-#include <ntqsplashscreen.h>
-#include <ntqsplitter.h>
+#include <tqsplashscreen.h>
+#include <tqsplitter.h>
 #include "tqsqlerror.h"
 #include "tqeditorfactory.h"
 #include "tqsqlquery.h"
@@ -247,7 +247,7 @@
 #include "tqurloperator.h"
 #include <tqfiledialog.h>
 #include <tqutfcodec.h>
-#include <ntquuid.h>
+#include <tquuid.h>
 #include <tqvalidator.h>
 #include <tqasyncimageio.h>
 #include <tqvaluestack.h>
diff --git a/src/kernel/tqthread.h b/src/kernel/tqthread.h
index 0b38e5a33..cde5aac80 100644
--- a/src/kernel/tqthread.h
+++ b/src/kernel/tqthread.h
@@ -44,7 +44,7 @@
 #if defined(TQT_THREAD_SUPPORT)
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #endif // QT_H
 
 #include <limits.h>
diff --git a/src/kernel/tqtranslator.cpp b/src/kernel/tqtranslator.cpp
index f67c6d363..fd86a73ca 100644
--- a/src/kernel/tqtranslator.cpp
+++ b/src/kernel/tqtranslator.cpp
@@ -65,7 +65,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 #include "tqbuffer.h"
 #include "tqdatastream.h"
 #include "tqmap.h"
-#include "ntqtl.h"
+#include "tqtl.h"
 
 #if defined(Q_OS_UNIX)
 #define QT_USE_MMAP
diff --git a/src/kernel/qvariant.cpp b/src/kernel/tqvariant.cpp
index 8f5768696..e400dbd07 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/tqvariant.cpp
@@ -40,7 +40,7 @@
 
 #include <float.h>
 
-#include "ntqvariant.h"
+#include "tqvariant.h"
 #ifndef TQT_NO_VARIANT
 #include "tqstring.h"
 #include "tqcstring.h"
@@ -61,7 +61,7 @@
 #include "tqcursor.h"
 #include "tqdatetime.h"
 #include "tqsizepolicy.h"
-#include "ntqshared.h"
+#include "tqshared.h"
 #include "tqbitarray.h"
 #include "tqkeysequence.h"
 #include "tqpen.h"
@@ -70,7 +70,7 @@
 #define DBL_DIG 10
 #endif //DBL_DIG
 
-// Uncomment to test for memory leaks or to run qt/test/qvariant/main.cpp
+// Uncomment to test for memory leaks or to run qt/test/tqvariant/main.cpp
 // #define TQVARIANT_DEBUG
 
 
@@ -354,7 +354,7 @@ void TQVariant::Private::clear()
 }
 
 /*!
-    \class TQVariant ntqvariant.h
+    \class TQVariant tqvariant.h
     \brief The TQVariant class acts like a union for the most common TQt data types.
 
     \ingroup objectmodel
diff --git a/src/kernel/ntqvariant.h b/src/kernel/tqvariant.h
index 2a6eeec19..2a6eeec19 100644
--- a/src/kernel/ntqvariant.h
+++ b/src/kernel/tqvariant.h
diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp
index e2e6c44f8..33c4768a6 100644
--- a/src/kernel/tqwidget.cpp
+++ b/src/kernel/tqwidget.cpp
@@ -1252,7 +1252,7 @@ void TQWidget::deactivateWidgetCleanup()
     id.
 
     The window identifier type depends on the underlying window
-    system, see \c ntqwindowdefs.h for the actual definition. If there
+    system, see \c tqwindowdefs.h for the actual definition. If there
     is no widget with this identifier, 0 is returned.
 */
 
diff --git a/src/kernel/tqwidget.h b/src/kernel/tqwidget.h
index f683af712..cf0325f3c 100644
--- a/src/kernel/tqwidget.h
+++ b/src/kernel/tqwidget.h
@@ -42,7 +42,7 @@
 #define TQWIDGET_H
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "tqobject.h"
 #include "tqpaintdevice.h"
 #include "tqpalette.h"
@@ -1042,6 +1042,6 @@ struct TQ_EXPORT TQWExtra {
 };
 
 #define Q_DEFINED_QWIDGET
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 
 #endif // TQWIDGET_H
diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/tqwindowdefs.h
index 166cc0638..69d9c3e0b 100644
--- a/src/kernel/ntqwindowdefs.h
+++ b/src/kernel/tqwindowdefs.h
@@ -131,7 +131,7 @@ typedef struct AEDesc AppleEvent;
 #endif // TQ_WS_MAC
 
 #if defined(TQ_WS_WIN)
-#include "qwindowdefs_win.h"
+#include "tqwindowdefs_win.h"
 #endif // TQ_WS_WIN
 
 
diff --git a/src/kernel/tqwmatrix.h b/src/kernel/tqwmatrix.h
index 7ac138804..dc437c008 100644
--- a/src/kernel/tqwmatrix.h
+++ b/src/kernel/tqwmatrix.h
@@ -42,7 +42,7 @@
 #define TQWMATRIX_H
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include "tqpointarray.h"
 #include "tqrect.h"
 #include "tqregion.h"
diff --git a/src/libqt.map b/src/libqt.map
index 1e75da0c0..9134b5638 100644
--- a/src/libqt.map
+++ b/src/libqt.map
@@ -28,10 +28,10 @@
 	PixElement::*;
 	QRenameEdit::*;
 	QRollEffect::*;
-	QSharedDoubleBufferCleaner::*;
+	TQSharedDoubleBufferCleaner::*;
 	QSmSocketReceiver::*;
 	TQSpinBoxValidator::*;
-	QSplitterHandle::*;
+	TQSplitterHandle::*;
 	TQSqlRecordShared::*;
 	QSVChildRec::*;
 	qt_xdnd_*;
diff --git a/src/moc/moc.y b/src/moc/moc.y
index a393aa868..5f9ffa10a 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -97,7 +97,7 @@ void yyerror( const char *msg );
 bool isEnumType( const char* type );
 int enumIndex( const char* type );
 bool isVariantType( const char* type );
-int qvariant_nameToType( const char* name );
+int tqvariant_nameToType( const char* name );
 static void init();				// initialize
 static void initClass();			// prepare for new class
 static void generateClass();			// generate C++ code for class
@@ -212,7 +212,7 @@ TQCString uTypeExtra( TQCString ctype )
     TQCString typeExtra = "0";
     if ( !validUType( ctype ) ) {
 	if ( isVariantType( rawUType(ctype) ) )
-	    typeExtra.sprintf("\"\\x%02x\"", qvariant_nameToType( rawUType(ctype) ) );
+	    typeExtra.sprintf("\"\\x%02x\"", tqvariant_nameToType( rawUType(ctype) ) );
 	else
 	    typeExtra.sprintf( "\"%s\"", rawUType(ctype).data() );
 	return typeExtra;
@@ -227,7 +227,7 @@ TQCString uTypeExtra( TQCString ctype )
 	if ( raw == "char" )
 	    ;
 	else if ( isVariantType( raw ) )
-	    typeExtra.sprintf("\"\\x%02x\"", qvariant_nameToType( raw ) );
+	    typeExtra.sprintf("\"\\x%02x\"", tqvariant_nameToType( raw ) );
 	else
 	    typeExtra.sprintf( "\"%s\"", raw.stripWhiteSpace().data() );
 
@@ -249,7 +249,7 @@ TQCString uTypeExtra( TQCString ctype )
 
 /*
   Attention!
-  This table is copied from qvariant.cpp. If you change
+  This table is copied from tqvariant.cpp. If you change
   one, change both.
 */
 static const int ntypes = 35;
@@ -292,7 +292,7 @@ static const char* const type_map[ntypes] =
     "TQ_ULLONG"
 };
 
-int qvariant_nameToType( const char* name )
+int tqvariant_nameToType( const char* name )
 {
     for ( int i = 0; i < ntypes; i++ ) {
 	if ( !qstrcmp( type_map[i], name ) )
@@ -306,7 +306,7 @@ int qvariant_nameToType( const char* name )
 */
 bool isVariantType( const char* type )
 {
-    return qvariant_nameToType( type ) != 0;
+    return tqvariant_nameToType( type ) != 0;
 }
 
 /*
@@ -569,7 +569,7 @@ class parser_reg {
     bool	  noInclude;		// no #include <filename>
     bool	  generatedCode;		// no code generated
     bool	  mocError;			// moc parsing error occurred
-    bool       hasVariantIncluded;	//whether or not ntqvariant.h was included yet
+    bool       hasVariantIncluded;	//whether or not tqvariant.h was included yet
     TQCString  className;				// name of parsed class
     TQCString  superClassName;			// name of first super class
     TQStrList  multipleSuperClasses;			// other superclasses
@@ -2747,7 +2747,7 @@ int generateProps()
 		if ( !isEnumType( it.current()->type ) )
 		    flags |= UnresolvedEnum;
 	    } else {
-		flags |= qvariant_nameToType( it.current()->type ) << 24;
+		flags |= tqvariant_nameToType( it.current()->type ) << 24;
 	    }
 	    if ( it.current()->getfunc )
 		flags |= Readable;
@@ -2923,7 +2923,7 @@ void generateClass()		      // generate C++ source code for a class
 	    needToIncludeVariant = ( f->type != "void" && !validUType( f->type ) && isVariantType( f->type) );
 
 	if ( needToIncludeVariant ) {
-	    fprintf( out, "#include <%sntqvariant.h>\n", (const char*)g->qtPath );
+	    fprintf( out, "#include <%stqvariant.h>\n", (const char*)g->qtPath );
 	    g->hasVariantIncluded = TRUE;
 	}
     }
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index ae23163da..d038c0b7e 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -110,7 +110,7 @@ void yyerror( const char *msg );
 bool isEnumType( const char* type );
 int enumIndex( const char* type );
 bool isVariantType( const char* type );
-int qvariant_nameToType( const char* name );
+int tqvariant_nameToType( const char* name );
 static void init();				// initialize
 static void initClass();			// prepare for new class
 static void generateClass();			// generate C++ code for class
@@ -225,7 +225,7 @@ TQCString uTypeExtra( TQCString ctype )
     TQCString typeExtra = "0";
     if ( !validUType( ctype ) ) {
 	if ( isVariantType( rawUType(ctype) ) )
-	    typeExtra.sprintf("\"\\x%02x\"", qvariant_nameToType( rawUType(ctype) ) );
+	    typeExtra.sprintf("\"\\x%02x\"", tqvariant_nameToType( rawUType(ctype) ) );
 	else
 	    typeExtra.sprintf( "\"%s\"", rawUType(ctype).data() );
 	return typeExtra;
@@ -240,7 +240,7 @@ TQCString uTypeExtra( TQCString ctype )
 	if ( raw == "char" )
 	    ;
 	else if ( isVariantType( raw ) )
-	    typeExtra.sprintf("\"\\x%02x\"", qvariant_nameToType( raw ) );
+	    typeExtra.sprintf("\"\\x%02x\"", tqvariant_nameToType( raw ) );
 	else
 	    typeExtra.sprintf( "\"%s\"", raw.stripWhiteSpace().data() );
 
@@ -262,7 +262,7 @@ TQCString uTypeExtra( TQCString ctype )
 
 /*
   Attention!
-  This table is copied from qvariant.cpp. If you change
+  This table is copied from tqvariant.cpp. If you change
   one, change both.
 */
 static const int ntypes = 35;
@@ -305,7 +305,7 @@ static const char* const type_map[ntypes] =
     "TQ_ULLONG"
 };
 
-int qvariant_nameToType( const char* name )
+int tqvariant_nameToType( const char* name )
 {
     for ( int i = 0; i < ntypes; i++ ) {
 	if ( !qstrcmp( type_map[i], name ) )
@@ -319,7 +319,7 @@ int qvariant_nameToType( const char* name )
 */
 bool isVariantType( const char* type )
 {
-    return qvariant_nameToType( type ) != 0;
+    return tqvariant_nameToType( type ) != 0;
 }
 
 /*
@@ -582,7 +582,7 @@ class parser_reg {
     bool	  noInclude;		// no #include <filename>
     bool	  generatedCode;		// no code generated
     bool	  mocError;			// moc parsing error occurred
-    bool       hasVariantIncluded;	//whether or not ntqvariant.h was included yet
+    bool       hasVariantIncluded;	//whether or not tqvariant.h was included yet
     TQCString  className;				// name of parsed class
     TQCString  superClassName;			// name of first super class
     TQStrList  multipleSuperClasses;			// other superclasses
@@ -5622,7 +5622,7 @@ int generateProps()
 		if ( !isEnumType( it.current()->type ) )
 		    flags |= UnresolvedEnum;
 	    } else {
-		flags |= qvariant_nameToType( it.current()->type ) << 24;
+		flags |= tqvariant_nameToType( it.current()->type ) << 24;
 	    }
 	    if ( it.current()->getfunc )
 		flags |= Readable;
@@ -5798,7 +5798,7 @@ void generateClass()		      // generate C++ source code for a class
 	    needToIncludeVariant = ( f->type != "void" && !validUType( f->type ) && isVariantType( f->type) );
 
 	if ( needToIncludeVariant ) {
-	    fprintf( out, "#include <%sntqvariant.h>\n", (const char*)g->qtPath );
+	    fprintf( out, "#include <%stqvariant.h>\n", (const char*)g->qtPath );
 	    g->hasVariantIncluded = TRUE;
 	}
     }
diff --git a/src/network/tqhttp.h b/src/network/tqhttp.h
index f1e68454f..2abf714f1 100644
--- a/src/network/tqhttp.h
+++ b/src/network/tqhttp.h
@@ -272,6 +272,6 @@ private:
 };
 
 #define Q_DEFINED_QHTTP
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif
 #endif
diff --git a/src/network/tqsocketdevice.cpp b/src/network/tqsocketdevice.cpp
index 1c6ce552f..f82d1625f 100644
--- a/src/network/tqsocketdevice.cpp
+++ b/src/network/tqsocketdevice.cpp
@@ -41,7 +41,7 @@
 #include "tqsocketdevice.h"
 #ifndef TQT_NO_NETWORK
 
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #include <string.h>
 
 
diff --git a/src/network/tqsocketdevice_unix.cpp b/src/network/tqsocketdevice_unix.cpp
index 0727f6a14..39a9560dd 100644
--- a/src/network/tqsocketdevice_unix.cpp
+++ b/src/network/tqsocketdevice_unix.cpp
@@ -84,7 +84,7 @@ static inline int qt_socket_socket(int domain, int type, int protocol)
 
 #ifndef TQT_NO_NETWORK
 
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 
 #include <errno.h>
 #include <sys/types.h>
diff --git a/src/opengl/tqglcolormap.h b/src/opengl/tqglcolormap.h
index 61fbd7c79..2a2d4f507 100644
--- a/src/opengl/tqglcolormap.h
+++ b/src/opengl/tqglcolormap.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqcolor.h"
 #include "tqmemarray.h"
-#include "ntqshared.h"
+#include "tqshared.h"
 #endif // QT_H
 
 #if !defined( TQT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/drivers/cache/tqsqlcachedresult.h b/src/sql/drivers/cache/tqsqlcachedresult.h
index f49ffea89..296937fb7 100644
--- a/src/sql/drivers/cache/tqsqlcachedresult.h
+++ b/src/sql/drivers/cache/tqsqlcachedresult.h
@@ -52,7 +52,7 @@
 //
 
 #include <tqglobal.h>
-#include <ntqvariant.h>
+#include <tqvariant.h>
 #include <tqptrvector.h>
 #include <tqvaluevector.h>
 #include <tqsqlresult.h>
diff --git a/src/sql/tqdatatable.h b/src/sql/tqdatatable.h
index 29f56b8ed..530d30ce1 100644
--- a/src/sql/tqdatatable.h
+++ b/src/sql/tqdatatable.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqstring.h"
-#include "ntqvariant.h"
+#include "tqvariant.h"
 #include "tqtable.h"
 #include "tqsql.h"
 #include "tqsqlcursor.h"
diff --git a/src/sql/tqeditorfactory.h b/src/sql/tqeditorfactory.h
index cea5885ac..fe290ad85 100644
--- a/src/sql/tqeditorfactory.h
+++ b/src/sql/tqeditorfactory.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqvariant.h"
+#include "tqvariant.h"
 #endif // QT_H
 
 #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/tqsqlextension_p.h b/src/sql/tqsqlextension_p.h
index c46e86c5c..76cb27337 100644
--- a/src/sql/tqsqlextension_p.h
+++ b/src/sql/tqsqlextension_p.h
@@ -57,7 +57,7 @@
 #include "tqmap.h"
 #include "tqvaluevector.h"
 #include "tqstring.h"
-#include "ntqvariant.h"
+#include "tqvariant.h"
 #include "tqsql.h"
 #endif // QT_H
 
@@ -87,7 +87,7 @@ struct Holder {
 };
 
 #define Q_DEFINED_QSQLEXTENSION
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 
 class TQM_EXPORT_SQL TQSqlExtension {
 public:
diff --git a/src/sql/tqsqlfield.h b/src/sql/tqsqlfield.h
index 4582cff12..580fcd7df 100644
--- a/src/sql/tqsqlfield.h
+++ b/src/sql/tqsqlfield.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqstring.h"
-#include "ntqvariant.h"
+#include "tqvariant.h"
 #endif // QT_H
 
 #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/tqsqlindex.h b/src/sql/tqsqlindex.h
index 3f08f3e4e..066c693c1 100644
--- a/src/sql/tqsqlindex.h
+++ b/src/sql/tqsqlindex.h
@@ -94,6 +94,6 @@ private:
 };
 
 #define Q_DEFINED_QSQLINDEX
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif	// TQT_NO_SQL
 #endif
diff --git a/src/sql/tqsqlpropertymap.h b/src/sql/tqsqlpropertymap.h
index bc21b69bf..5d2a8d6bc 100644
--- a/src/sql/tqsqlpropertymap.h
+++ b/src/sql/tqsqlpropertymap.h
@@ -42,7 +42,7 @@
 #define TQSQLPROPERTYMAP_H
 
 #ifndef QT_H
-#include "ntqvariant.h"
+#include "tqvariant.h"
 #include "tqstring.h"
 #endif // QT_H
 
diff --git a/src/sql/tqsqlquery.h b/src/sql/tqsqlquery.h
index e7e7674c1..5220fa27a 100644
--- a/src/sql/tqsqlquery.h
+++ b/src/sql/tqsqlquery.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqobject.h"
 #include "tqstring.h"
-#include "ntqvariant.h"
+#include "tqvariant.h"
 #include "tqvaluelist.h"
 #include "tqsqlerror.h"
 #include "tqsqlfield.h"
diff --git a/src/sql/tqsqlrecord.cpp b/src/sql/tqsqlrecord.cpp
index 9c567c126..fba3d9e63 100644
--- a/src/sql/tqsqlrecord.cpp
+++ b/src/sql/tqsqlrecord.cpp
@@ -44,7 +44,7 @@
 
 #include "tqregexp.h"
 #include "tqvaluevector.h"
-#include "ntqshared.h"
+#include "tqshared.h"
 #include "tqnamespace.h"
 
 class TQSqlRecordPrivate
diff --git a/src/sql/tqsqlrecord.h b/src/sql/tqsqlrecord.h
index 569f031f8..bf0d981d8 100644
--- a/src/sql/tqsqlrecord.h
+++ b/src/sql/tqsqlrecord.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqstring.h"
 #include "tqstringlist.h"
-#include "ntqvariant.h"
+#include "tqvariant.h"
 #include "tqsqlfield.h"
 #endif // QT_H
 
diff --git a/src/sql/tqsqlresult.h b/src/sql/tqsqlresult.h
index 6a11443c7..9984017e2 100644
--- a/src/sql/tqsqlresult.h
+++ b/src/sql/tqsqlresult.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqstring.h"
-#include "ntqvariant.h"
+#include "tqvariant.h"
 #include "tqsqlerror.h"
 #include "tqsqlfield.h"
 #include "tqsql.h"
diff --git a/src/styles/tqmotifstyle.cpp b/src/styles/tqmotifstyle.cpp
index 3276bfddb..d2248e83f 100644
--- a/src/styles/tqmotifstyle.cpp
+++ b/src/styles/tqmotifstyle.cpp
@@ -54,7 +54,7 @@
 #include "tqtabbar.h"
 #include "tqtabwidget.h"
 #include "tqlistview.h"
-#include "ntqsplitter.h"
+#include "tqsplitter.h"
 #include "tqslider.h"
 #include "tqcombobox.h"
 #include "tqdockwindow.h"
diff --git a/src/table/tqtable.h b/src/table/tqtable.h
index 51393ae76..9f2535ec7 100644
--- a/src/table/tqtable.h
+++ b/src/table/tqtable.h
@@ -49,7 +49,7 @@
 #include "tqmemarray.h"
 #include "tqptrlist.h"
 #include "tqguardedptr.h"
-#include "ntqshared.h"
+#include "tqshared.h"
 #include "tqintdict.h"
 #include "tqstringlist.h"
 #endif // QT_H
@@ -111,7 +111,7 @@ private:
 };
 
 #define Q_DEFINED_QTABLE_SELECTION
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 
 class TQM_EXPORT_TABLE TQTableItem : public TQt
 {
@@ -178,7 +178,7 @@ private:
 };
 
 #define Q_DEFINED_QTABLE_ITEM
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 
 class TQM_EXPORT_TABLE TQComboTableItem : public TQTableItem
 {
@@ -556,6 +556,6 @@ private:
 };
 
 #define Q_DEFINED_QTABLE
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQT_NO_TABLE
 #endif // TABLE_H
diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h
index 623c920dc..0c9d60d01 100644
--- a/src/tools/qcom_p.h
+++ b/src/tools/qcom_p.h
@@ -53,7 +53,7 @@
 
 #ifndef QT_H
 #include "tqstringlist.h"
-#include "ntquuid.h"
+#include "tquuid.h"
 #endif // QT_H
 
 #if __GNUC__ - 0 > 3
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index 03bf94e37..c8eacaee8 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -48,7 +48,7 @@ tools {
 		  $$TOOLS_H/tqsemaphore.h \
 		  $$TOOLS_H/tqsettings.h \
 		  $$TOOLS_P/tqsettings_p.h \
-		  $$TOOLS_H/ntqshared.h \
+		  $$TOOLS_H/tqshared.h \
 		  $$TOOLS_H/tqptrstack.h \
 		  $$TOOLS_H/tqstring.h \
 		  $$TOOLS_H/tqstringlist.h \
@@ -65,7 +65,7 @@ tools {
 		  $$TOOLS_H/tqwaitcondition.h \
 		  $$TOOLS_P/qcom_p.h \
 		  $$TOOLS_P/qucom_p.h \
-		  $$TOOLS_H/ntquuid.h
+		  $$TOOLS_H/tquuid.h
 
 	win32:SOURCES += $$TOOLS_CPP/tqdir_win.cpp \
 	 	  $$TOOLS_CPP/tqfile_win.cpp \
@@ -77,7 +77,7 @@ tools {
 		  $$TOOLS_CPP/tqthreadstorage_win.cpp \
 		  $$TOOLS_CPP/qcriticalsection_p.cpp
 
-	win32-borland:SOURCES += $$TOOLS_CPP/qwinexport.cpp
+	win32-borland:SOURCES += $$TOOLS_CPP/tqwinexport.cpp
 
 	wince-* {
 		SOURCES -= $$TOOLS_CPP/tqdir_win.cpp \
@@ -137,7 +137,7 @@ tools {
 		  $$TOOLS_CPP/tqtextstream.cpp \
 		  $$TOOLS_CPP/qunicodetables.cpp \
 		  $$TOOLS_CPP/qucom.cpp \
-		  $$TOOLS_CPP/quuid.cpp
+		  $$TOOLS_CPP/tquuid.cpp
 
         irix-cc* {
                 CXXFLAGS_PRELINK = $$QMAKE_CXXFLAGS
diff --git a/src/tools/qucom.cpp b/src/tools/qucom.cpp
index 372b1358a..8444c7f3b 100644
--- a/src/tools/qucom.cpp
+++ b/src/tools/qucom.cpp
@@ -41,7 +41,7 @@
 #include "private/qucom_p.h"
 #include "private/qucomextra_p.h"
 
-#include "ntqvariant.h"
+#include "tqvariant.h"
 
 #include <new>
 
diff --git a/src/tools/qucom_p.h b/src/tools/qucom_p.h
index ce4db1f00..761d5cee4 100644
--- a/src/tools/qucom_p.h
+++ b/src/tools/qucom_p.h
@@ -55,7 +55,7 @@
 
 #ifndef QT_H
 #include "tqstring.h"
-#include "ntquuid.h"
+#include "tquuid.h"
 #endif // QT_H
 
 #ifdef check
diff --git a/src/tools/tqasciidict.h b/src/tools/tqasciidict.h
index 7489e1822..24c28894b 100644
--- a/src/tools/tqasciidict.h
+++ b/src/tools/tqasciidict.h
@@ -119,5 +119,5 @@ public:
 };
 
 #define Q_DEFINED_QASCIIDICT
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQASCIIDICT_H
diff --git a/src/tools/tqcstring.h b/src/tools/tqcstring.h
index 3d989ff52..4f7f31942 100644
--- a/src/tools/tqcstring.h
+++ b/src/tools/tqcstring.h
@@ -378,5 +378,5 @@ TQ_EXPORT inline const TQCString operator+( char c1, const TQCString &s2 )
     tmp += s2;
     return tmp;
 }
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQCSTRING_H
diff --git a/src/tools/tqdict.h b/src/tools/tqdict.h
index f82579919..014fb893a 100644
--- a/src/tools/tqdict.h
+++ b/src/tools/tqdict.h
@@ -119,5 +119,5 @@ public:
 };
 
 #define Q_DEFINED_QDICT
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQDICT_H
diff --git a/src/tools/tqfeatures.txt b/src/tools/tqfeatures.txt
index d6a05abb4..fa42349b2 100644
--- a/src/tools/tqfeatures.txt
+++ b/src/tools/tqfeatures.txt
@@ -92,13 +92,13 @@ SeeAlso: ???
 Feature: TEMPLATE_VARIANT
 Section: Data structures
 Requires: VARIANT STRINGLIST
-Name: Template classes in QVariant
+Name: Template classes in TQVariant
 SeeAlso: ???
 
 Feature: VARIANT
 Section: Data structures
 Requires:
-Name: QVariant
+Name: TQVariant
 SeeAlso: ???
 
 Feature: REGEXP_OPTIM
diff --git a/src/tools/tqgarray.cpp b/src/tools/tqgarray.cpp
index b8d500adf..1eb1a05c2 100644
--- a/src/tools/tqgarray.cpp
+++ b/src/tools/tqgarray.cpp
@@ -77,7 +77,7 @@
 #endif
 
 /*!
-  \class TQShared ntqshared.h
+  \class TQShared tqshared.h
   \reentrant
   \ingroup shared
   \brief The TQShared class is used internally for implementing shared classes.
diff --git a/src/tools/tqgarray.h b/src/tools/tqgarray.h
index 4d239dd66..6340f7ccb 100644
--- a/src/tools/tqgarray.h
+++ b/src/tools/tqgarray.h
@@ -42,7 +42,7 @@
 #define TQGARRAY_H
 
 #ifndef QT_H
-#include "ntqshared.h"
+#include "tqshared.h"
 #endif // QT_H
 
 
diff --git a/src/tools/tqgpluginmanager_p.h b/src/tools/tqgpluginmanager_p.h
index 7b713990c..946fe3bc4 100644
--- a/src/tools/tqgpluginmanager_p.h
+++ b/src/tools/tqgpluginmanager_p.h
@@ -42,7 +42,7 @@
 #ifndef QT_H
 #include "tqdict.h"
 #include "tqlibrary.h"
-#include "ntquuid.h"
+#include "tquuid.h"
 #include "tqstringlist.h"
 #include "qcom_p.h"
 #endif // QT_H
diff --git a/src/tools/tqintdict.h b/src/tools/tqintdict.h
index 4c20aa486..8427e4467 100644
--- a/src/tools/tqintdict.h
+++ b/src/tools/tqintdict.h
@@ -115,5 +115,5 @@ public:
 };
 
 #define Q_DEFINED_QINTDICT
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQINTDICT_H
diff --git a/src/tools/tqlibrary.h b/src/tools/tqlibrary.h
index d8b5f4ba5..6b53edf7f 100644
--- a/src/tools/tqlibrary.h
+++ b/src/tools/tqlibrary.h
@@ -81,6 +81,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 #define Q_DEFINED_QLIBRARY
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif //TQT_NO_LIBRARY
 #endif //TQLIBRARY_H
diff --git a/src/tools/tqlibrary_p.h b/src/tools/tqlibrary_p.h
index 1ae03c601..d4aa33d66 100644
--- a/src/tools/tqlibrary_p.h
+++ b/src/tools/tqlibrary_p.h
@@ -58,7 +58,7 @@
 #ifndef TQT_NO_LIBRARY
 
 #ifndef QT_H
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #endif // QT_H
 
 class TQLibraryPrivate
diff --git a/src/tools/tqmap.h b/src/tools/tqmap.h
index 6a813dd6c..46e4c4fbb 100644
--- a/src/tools/tqmap.h
+++ b/src/tools/tqmap.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqglobal.h"
-#include "ntqshared.h"
+#include "tqshared.h"
 #include "tqdatastream.h"
 #include "tqpair.h"
 #include "tqvaluelist.h"
@@ -877,5 +877,5 @@ TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQMap<Key,T
 #endif
 
 #define Q_DEFINED_QMAP
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQMAP_H
diff --git a/src/tools/tqmemarray.h b/src/tools/tqmemarray.h
index 1ea8c2ad5..39898a47a 100644
--- a/src/tools/tqmemarray.h
+++ b/src/tools/tqmemarray.h
@@ -113,5 +113,5 @@ public:
 };
 
 #define Q_DEFINED_QMEMARRAY
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif
diff --git a/src/tools/tqptrlist.h b/src/tools/tqptrlist.h
index 0fbea042b..861dbc031 100644
--- a/src/tools/tqptrlist.h
+++ b/src/tools/tqptrlist.h
@@ -186,6 +186,6 @@ public:
 };
 
 #define Q_DEFINED_QPTRLIST
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 
 #endif // TQPTRLIST_H
diff --git a/src/tools/tqptrvector.h b/src/tools/tqptrvector.h
index 764b5732d..bf2846209 100644
--- a/src/tools/tqptrvector.h
+++ b/src/tools/tqptrvector.h
@@ -110,5 +110,5 @@ template<class type> inline void TQPtrVector<type>::deleteItem( TQPtrCollection:
 }
 
 #define Q_DEFINED_QPTRVECTOR
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQPTRVECTOR_H
diff --git a/src/tools/tqregexp.cpp b/src/tools/tqregexp.cpp
index 1aed2ca4c..6ed3e3a15 100644
--- a/src/tools/tqregexp.cpp
+++ b/src/tools/tqregexp.cpp
@@ -50,7 +50,7 @@
 #include "tqmap.h"
 #include "tqptrvector.h"
 #include "tqstring.h"
-#include "ntqtl.h"
+#include "tqtl.h"
 
 #ifdef TQT_THREAD_SUPPORT
 #include "tqthreadstorage.h"
diff --git a/src/tools/ntqshared.h b/src/tools/tqshared.h
index 62dcc8e35..62dcc8e35 100644
--- a/src/tools/ntqshared.h
+++ b/src/tools/tqshared.h
diff --git a/src/tools/tqstring.h b/src/tools/tqstring.h
index 253ba3a03..03fcf9459 100644
--- a/src/tools/tqstring.h
+++ b/src/tools/tqstring.h
@@ -1109,5 +1109,5 @@ extern TQ_EXPORT TQString qt_winMB2TQString( const char* mb, int len=-1 );
 #endif
 
 #define Q_DEFINED_QSTRING
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQSTRING_H
diff --git a/src/tools/tqstringlist.cpp b/src/tools/tqstringlist.cpp
index 43637c203..b1a2f70c4 100644
--- a/src/tools/tqstringlist.cpp
+++ b/src/tools/tqstringlist.cpp
@@ -44,7 +44,7 @@
 #include "tqregexp.h"
 #include "tqstrlist.h"
 #include "tqdatastream.h"
-#include "ntqtl.h"
+#include "tqtl.h"
 
 /*!
     \class TQStringList tqstringlist.h
@@ -61,7 +61,7 @@
     objects. Unlike TQStrList, which stores pointers to characters,
     TQStringList holds real TQString objects. It is the class of choice
     whenever you work with Unicode strings. TQStringList is part of the
-    \link ntqtl.html TQt Template Library\endlink.
+    \link tqtl.html TQt Template Library\endlink.
 
     Like TQString itself, TQStringList objects are implicitly shared, so
     passing them around as value-parameters is both fast and safe.
@@ -171,7 +171,7 @@
 /*!
     Sorts the list of strings in ascending case-sensitive order.
 
-    Sorting is very fast. It uses the \link ntqtl.html TQt Template
+    Sorting is very fast. It uses the \link tqtl.html TQt Template
     Library's\endlink efficient HeapSort implementation that has a
     time complexity of O(n*log n).
 
diff --git a/src/tools/tqthreadinstance_p.h b/src/tools/tqthreadinstance_p.h
index 1cc0d083e..2778d5daa 100644
--- a/src/tools/tqthreadinstance_p.h
+++ b/src/tools/tqthreadinstance_p.h
@@ -55,7 +55,7 @@
 
 #ifndef QT_H
 #include "tqmutex.h"
-#include "ntqwindowdefs.h"
+#include "tqwindowdefs.h"
 #endif // QT_H
 
 #ifdef Q_OS_UNIX
diff --git a/src/tools/ntqtl.h b/src/tools/tqtl.h
index df5a7cdb6..df5a7cdb6 100644
--- a/src/tools/ntqtl.h
+++ b/src/tools/tqtl.h
diff --git a/src/tools/quuid.cpp b/src/tools/tquuid.cpp
index b07eadd09..566c9f405 100644
--- a/src/tools/quuid.cpp
+++ b/src/tools/tquuid.cpp
@@ -36,12 +36,12 @@
 **
 **********************************************************************/
 
-#include "ntquuid.h"
+#include "tquuid.h"
 
 #include "tqdatastream.h"
 
 /*!
-    \class TQUuid ntquuid.h
+    \class TQUuid tquuid.h
     \brief The TQUuid class defines a Universally Unique Identifier (UUID).
 
     \reentrant
diff --git a/src/tools/ntquuid.h b/src/tools/tquuid.h
index 69092a5d7..69092a5d7 100644
--- a/src/tools/ntquuid.h
+++ b/src/tools/tquuid.h
diff --git a/src/tools/tqvaluelist.h b/src/tools/tqvaluelist.h
index 8a5bcb841..d90001397 100644
--- a/src/tools/tqvaluelist.h
+++ b/src/tools/tqvaluelist.h
@@ -42,8 +42,8 @@
 #define TQVALUELIST_H
 
 #ifndef QT_H
-#include "ntqtl.h"
-#include "ntqshared.h"
+#include "tqtl.h"
+#include "tqshared.h"
 #include "tqdatastream.h"
 #endif // QT_H
 
@@ -677,5 +677,5 @@ TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueList
 
 #define Q_DEFINED_QVALUELIST
 #define Q_DEFINED_QVALUELIST
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQVALUELIST_H
diff --git a/src/tools/tqvaluevector.h b/src/tools/tqvaluevector.h
index fd45bce85..06dfc06f4 100644
--- a/src/tools/tqvaluevector.h
+++ b/src/tools/tqvaluevector.h
@@ -42,8 +42,8 @@
 #include <cstddef>
 
 #ifndef QT_H
-#include "ntqtl.h"
-#include "ntqshared.h"
+#include "tqtl.h"
+#include "tqshared.h"
 #include "tqdatastream.h"
 #endif // QT_H
 
@@ -573,5 +573,5 @@ TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueVect
 #endif // TQT_NO_DATASTREAM
 
 #define Q_DEFINED_QVALUEVECTOR
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif // TQVALUEVECTOR_H
diff --git a/src/tools/qwinexport.cpp b/src/tools/tqwinexport.cpp
index d1a2bce22..d1a2bce22 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/tqwinexport.cpp
diff --git a/src/tools/ntqwinexport.h b/src/tools/tqwinexport.h
index 2f4c41f13..2f4c41f13 100644
--- a/src/tools/ntqwinexport.h
+++ b/src/tools/tqwinexport.h
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index 4d124e940..9cb2f4b55 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -38,9 +38,9 @@ widgets {
 		  $$WIDGETS_H/tqscrollbar.h \
 		  $$WIDGETS_H/tqscrollview.h \
 		  $$WIDGETS_H/tqslider.h \
-		  $$WIDGETS_H/ntqsplashscreen.h \
+		  $$WIDGETS_H/tqsplashscreen.h \
 		  $$WIDGETS_H/tqspinbox.h \
-		  $$WIDGETS_H/ntqsplitter.h \
+		  $$WIDGETS_H/tqsplitter.h \
 		  $$WIDGETS_H/tqstatusbar.h \
 		  $$WIDGETS_H/tqtabbar.h \
 		  $$WIDGETS_H/tqsyntaxhighlighter.h \
@@ -100,10 +100,10 @@ widgets {
 		  $$WIDGETS_CPP/tqscrollbar.cpp \
 		  $$WIDGETS_CPP/tqscrollview.cpp \
 		  $$WIDGETS_CPP/tqslider.cpp \
-		  $$WIDGETS_CPP/qsplashscreen.cpp \
+		  $$WIDGETS_CPP/tqsplashscreen.cpp \
 		  $$WIDGETS_CPP/tqspinbox.cpp \
 		  $$WIDGETS_CPP/tqspinwidget.cpp \
-		  $$WIDGETS_CPP/qsplitter.cpp \
+		  $$WIDGETS_CPP/tqsplitter.cpp \
 		  $$WIDGETS_CPP/tqstatusbar.cpp \
 		  $$WIDGETS_CPP/tqsyntaxhighlighter.cpp \
 		  $$WIDGETS_CPP/tqtabbar.cpp \
@@ -134,8 +134,8 @@ wince-* {
 	HEADERS += $$WIDGETS_H/ce/qcemainwindow.h
 
 	SOURCES -= $$WIDGETS_CPP/tqsyntaxhighlighter.cpp \
-		   $$WIDGETS_CPP/qsplashscreen.cpp
+		   $$WIDGETS_CPP/tqsplashscreen.cpp
 
 	HEADERS -= $$WIDGETS_H/tqsyntaxhighlighter.h \
-		   $$WIDGETS_H/ntqsplashscreen.h
+		   $$WIDGETS_H/tqsplashscreen.h
 }
diff --git a/src/widgets/tqdialogbuttons.cpp b/src/widgets/tqdialogbuttons.cpp
index cbc791ebb..12015bceb 100644
--- a/src/widgets/tqdialogbuttons.cpp
+++ b/src/widgets/tqdialogbuttons.cpp
@@ -43,7 +43,7 @@
 #include <tqpushbutton.h>
 #include <tqguardedptr.h>
 #include <tqmap.h>
-#include <ntqvariant.h>
+#include <tqvariant.h>
 #ifndef TQT_NO_DIALOG
 #include <tqdialog.h>
 #endif // TQT_NO_DIALOG
diff --git a/src/widgets/tqdockarea.cpp b/src/widgets/tqdockarea.cpp
index b3133cfb5..0f14a33a7 100644
--- a/src/widgets/tqdockarea.cpp
+++ b/src/widgets/tqdockarea.cpp
@@ -41,7 +41,7 @@
 #include "tqdockarea.h"
 
 #ifndef TQT_NO_MAINWINDOW
-#include "ntqsplitter.h"
+#include "tqsplitter.h"
 #include "tqlayout.h"
 #include "tqptrvector.h"
 #include "ntqapplication.h"
diff --git a/src/widgets/tqdockarea.h b/src/widgets/tqdockarea.h
index ff97e2a8f..a0a319a45 100644
--- a/src/widgets/tqdockarea.h
+++ b/src/widgets/tqdockarea.h
@@ -185,7 +185,7 @@ TQ_EXPORT TQTextStream &operator>>( TQTextStream &, TQDockArea & );
 #endif
 
 #define Q_DEFINED_QDOCKAREA
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif
 
 #endif //TQT_NO_MAINWINDOW
diff --git a/src/widgets/tqdockwindow.h b/src/widgets/tqdockwindow.h
index ad5fa47e7..896b8709f 100644
--- a/src/widgets/tqdockwindow.h
+++ b/src/widgets/tqdockwindow.h
@@ -231,7 +231,7 @@ inline TQDockArea *TQDockWindow::area() const
 }
 
 #define Q_DEFINED_QDOCKWINDOW
-#include "ntqwinexport.h"
+#include "tqwinexport.h"
 #endif
 
 #endif // TQDOCKWINDOW_H
diff --git a/src/widgets/tqlistview.cpp b/src/widgets/tqlistview.cpp
index 084fcf203..54473b6c5 100644
--- a/src/widgets/tqlistview.cpp
+++ b/src/widgets/tqlistview.cpp
@@ -56,7 +56,7 @@
 #include "tqcleanuphandler.h"
 #include "tqpixmapcache.h"
 #include "tqpopupmenu.h"
-#include "ntqtl.h"
+#include "tqtl.h"
 #include "tqdragobject.h"
 #include "tqlineedit.h"
 #include "tqvbox.h"
diff --git a/src/widgets/qsplashscreen.cpp b/src/widgets/tqsplashscreen.cpp
index b4ed5241e..78aa19869 100644
--- a/src/widgets/qsplashscreen.cpp
+++ b/src/widgets/tqsplashscreen.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#include "ntqsplashscreen.h"
+#include "tqsplashscreen.h"
 
 #ifndef TQT_NO_SPLASHSCREEN
 
@@ -54,7 +54,7 @@ public:
 };
 
 /*!
-   \class TQSplashScreen ntqsplashscreen.h
+   \class TQSplashScreen tqsplashscreen.h
    \brief The TQSplashScreen widget provides a splash screen that can
    be shown during application startup.
 
diff --git a/src/widgets/ntqsplashscreen.h b/src/widgets/tqsplashscreen.h
index 99b625f9f..99b625f9f 100644
--- a/src/widgets/ntqsplashscreen.h
+++ b/src/widgets/tqsplashscreen.h
diff --git a/src/widgets/qsplitter.cpp b/src/widgets/tqsplitter.cpp
index 1e6699806..e9de06731 100644
--- a/src/widgets/qsplitter.cpp
+++ b/src/widgets/tqsplitter.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsplitter.h"
+#include "tqsplitter.h"
 #ifndef TQT_NO_SPLITTER
 
 #include "tqlayout.h"
@@ -206,7 +206,7 @@ TQCOORD TQSplitterLayoutStruct::getSizer( Orientation orient )
     is also possible to reorder the widgets within the splitter using
     moveToFirst() and moveToLast().
 
-    <img src=qsplitter-m.png> <img src=qsplitter-w.png>
+    <img src=tqsplitter-m.png> <img src=tqsplitter-w.png>
 
     \sa TQTabBar
 */
diff --git a/src/widgets/ntqsplitter.h b/src/widgets/tqsplitter.h
index bd8aef13e..bd8aef13e 100644
--- a/src/widgets/ntqsplitter.h
+++ b/src/widgets/tqsplitter.h
diff --git a/src/widgets/tqwhatsthis.cpp b/src/widgets/tqwhatsthis.cpp
index 242016454..4b38a43d5 100644
--- a/src/widgets/tqwhatsthis.cpp
+++ b/src/widgets/tqwhatsthis.cpp
@@ -45,7 +45,7 @@
 #include "tqtimer.h"
 #include "tqptrdict.h"
 #include "tqtoolbutton.h"
-#include "ntqshared.h"
+#include "tqshared.h"
 #include "tqcursor.h"
 #include "tqbitmap.h"
 #include "tqtooltip.h"