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

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

49 files changed, 70 insertions, 70 deletions

diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 8ad7f5a5..db0fa027 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 d3e214b0..315b931f 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 df8a6575..23bdb7ea 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 53af84de..4e0de283 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 25b12077..ead26b9b 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 6ec4424e..dc32bb14 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 0202f78d..32d715bb 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 0fca5509..96bb758b 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 6906184b..6b769484 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 aeb36d2f..9ff7d1b7 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 fc229f9a..6011dd35 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 b9a75241..45c6a1bf 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 f28cf121..46e5fae9 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 43256972..27f5269e 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 36bcfcfe..33f10900 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 4a5e5c53..cb18ac6e 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 29ef8b8c..e31d6f0c 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 37ba52b6..e7b94e9c 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 88ea36bd..65905778 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 fd34dc73..efb1295e 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 00c31a37..61420684 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 cb1dfe7a..1e376c21 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 eb627831..bb260b19 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 9e6cc669..a846f691 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 7bfbdf23..5a1ce830 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 9f0ca13f..8eaaf264 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 3a0a0f8d..687b6d48 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 c38e379b..7ca71488 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 a9e46a9f..84f80557 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 9e45f1fa..0af8a22c 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 d7dd2886..1b66b183 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 51b3ac9b..e8590cbd 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 ae79dd30..696d7997 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 bb3875a0..11608136 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 e7e67a28..7b170fd1 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 f35ad18a..8a302eaa 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 a49dd25a..20c844de 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 3141fc2b..c5c64300 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 d3ba92ed..d3ba92ed 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 ea0d8f21..bbdbf5b4 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 7032b738..8a04bdf3 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 0b38e5a3..cde5aac8 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 f67c6d36..fd86a73c 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 8f576869..e400dbd0 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 2a6eeec1..2a6eeec1 100644
--- a/src/kernel/ntqvariant.h
+++ b/src/kernel/tqvariant.h
diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp
index e2e6c44f..33c4768a 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 f683af71..cf0325f3 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 166cc063..69d9c3e0 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 7ac13880..dc437c00 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"