Rename utility class nt* related files to equivalent tq*

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

51 files changed, 76 insertions, 76 deletions

diff --git a/src/kernel/ntqaccessible.h b/src/kernel/ntqaccessible.h
index 39f68ee3f..2d0302a9d 100644
--- a/src/kernel/ntqaccessible.h
+++ b/src/kernel/ntqaccessible.h
@@ -44,7 +44,7 @@
 #include <private/qcom_p.h>
 #include "ntqrect.h"
 #include "ntqguardedptr.h"
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
 #endif // QT_H
 
 #if defined(QT_ACCESSIBILITY_SUPPORT)
diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h
index 9f4c7938f..3568ad454 100644
--- a/src/kernel/ntqapplication.h
+++ b/src/kernel/ntqapplication.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqdesktopwidget.h"
-#include "ntqasciidict.h"
+#include "tqasciidict.h"
 #include "ntqpalette.h"
 #include "ntqtranslator.h"
 #include "tqstrlist.h"
diff --git a/src/kernel/ntqnetworkprotocol.h b/src/kernel/ntqnetworkprotocol.h
index f41d14c4d..55c7436da 100644
--- a/src/kernel/ntqnetworkprotocol.h
+++ b/src/kernel/ntqnetworkprotocol.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqurlinfo.h"
 #include "tqstring.h"
-#include "ntqdict.h"
+#include "tqdict.h"
 #include "tqobject.h"
 #endif // QT_H
 
diff --git a/src/kernel/ntqpointarray.h b/src/kernel/ntqpointarray.h
index bd7b50fbc..515935ac7 100644
--- a/src/kernel/ntqpointarray.h
+++ b/src/kernel/ntqpointarray.h
@@ -42,7 +42,7 @@
 #define TQPOINTARRAY_H
 
 #ifndef QT_H
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
 #include "ntqpoint.h"
 #endif // QT_H
 
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 778a0a93c..e9b0343a4 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -23,8 +23,8 @@
 #include "tqobjectdefs.h"
 #include "ntqnamespace.h"
 #include "ntqgarray.h"
-#include "ntqmemarray.h"
-#include "ntqcstring.h"
+#include "tqmemarray.h"
+#include "tqcstring.h"
 #include "tqstring.h"
 #include "tqptrlist.h"
 #include "ntqiodevice.h"
@@ -42,7 +42,7 @@
 #include "ntqtl.h"
 #include "tqsize.h"
 #include "ntqrect.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
 #include "ntqregion.h"
 #include "tqsql.h"
 #include "tqstrlist.h"
@@ -50,10 +50,10 @@
 #include "tqmap.h"
 #include "tqdatetime.h"
 #include "tqmime.h"
-#include "ntqasciidict.h"
+#include "tqasciidict.h"
 #include "ntqpaintdevice.h"
 #include "ntqfontmetrics.h"
-#include "ntqdict.h"
+#include "tqdict.h"
 #include "ntqevent.h"
 #include "ntqhostaddress.h"
 #include "tqstringlist.h"
@@ -89,7 +89,7 @@
 #include "ntqgcache.h"
 #include <ntqgif.h>
 #include <ntqglcolormap.h>
-#include <ntqcache.h>
+#include <tqcache.h>
 #include <tqdropsite.h>
 #include "ntqgplugin.h"
 #include <ntqgrid.h>
@@ -108,8 +108,8 @@
 #include "tqimage.h"
 #include <tqimageformatplugin.h>
 #include "ntqlineedit.h"
-#include <ntqintcache.h>
-#include "ntqintdict.h"
+#include <tqintcache.h>
+#include "tqintdict.h"
 #include "ntqmotifstyle.h"
 #include "ntqpicture.h"
 #include <tqjiscodec.h>
@@ -126,7 +126,7 @@
 #include "ntqdir.h"
 #include "ntqwindowsstyle.h"
 #include "ntqconnection.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "ntqvariant.h"
 #include "ntqsignal.h"
 #include <ntqmessagebox.h>
@@ -163,7 +163,7 @@
 #include <ntqprinter.h>
 #include <ntqprocess.h>
 #include "ntqprogressbar.h"
-#include <ntqasciicache.h>
+#include <tqasciicache.h>
 #include "tqptrdict.h"
 #include <ntqcleanuphandler.h>
 #include <tqptrqueue.h>
@@ -173,7 +173,7 @@
 #include <ntqradiobutton.h>
 #include <ntqdial.h>
 #include <ntqdockarea.h>
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include <ntqclipboard.h>
 #include <tqhebrewcodec.h>
 #include <ntqlistbox.h>
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index c2b64a636..47524c6a5 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -70,7 +70,7 @@
 #include "tqobjectlist.h"
 #include "tqwidgetlist.h"
 #include "tqwidgetintdict.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
 #include "ntqpainter.h"
 #include "ntqpixmapcache.h"
 #include "tqdatetime.h"
@@ -80,7 +80,7 @@
 #include "ntqsocketnotifier.h"
 #include "tqsessionmanager.h"
 #include "tqvaluelist.h"
-#include "ntqdict.h"
+#include "tqdict.h"
 #include "ntqguardedptr.h"
 #include "ntqclipboard.h"
 #include "ntqwhatsthis.h" // ######## dependency
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp
index e8eeac848..056b3de91 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/qclipboard_x11.cpp
@@ -66,7 +66,7 @@
 
 #include "ntqapplication.h"
 #include "ntqeventloop.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "tqdatetime.h"
 #include "tqdragobject.h"
 #include "ntqbuffer.h"
diff --git a/src/kernel/qcolor_x11.cpp b/src/kernel/qcolor_x11.cpp
index 8f02bcde9..b223222a9 100644
--- a/src/kernel/qcolor_x11.cpp
+++ b/src/kernel/qcolor_x11.cpp
@@ -58,7 +58,7 @@
   this TQt application.
  *****************************************************************************/
 
-#include "ntqintdict.h"
+#include "tqintdict.h"
 
 struct TQColorData {
     uint pix;					// allocated pixel value
diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp
index d6b736460..7d1b0a160 100644
--- a/src/kernel/qcursor.cpp
+++ b/src/kernel/qcursor.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_CURSOR
 
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "tqimage.h"
 #include "ntqdatastream.h"
 
diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp
index 8cf9f6dde..f7a073612 100644
--- a/src/kernel/qcursor_x11.cpp
+++ b/src/kernel/qcursor_x11.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqcursor.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "tqimage.h"
 #include "ntqapplication.h"
 #include "ntqdatastream.h"
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index dc4b9678b..0a51b9f2e 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -45,14 +45,14 @@
 #ifndef TQT_NO_DRAGANDDROP
 
 #include "tqwidget.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
 #include "tqdatetime.h"
-#include "ntqdict.h"
+#include "tqdict.h"
 #include "ntqguardedptr.h"
 #include "tqdragobject.h"
 #include "tqobjectlist.h"
 #include "ntqcursor.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "ntqpainter.h"
 
 #include "qt_x11_p.h"
diff --git a/src/kernel/qdrawutil.cpp b/src/kernel/qdrawutil.cpp
index 0ac5bde33..c98ef3dc4 100644
--- a/src/kernel/qdrawutil.cpp
+++ b/src/kernel/qdrawutil.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqdrawutil.h"
 #ifndef TQT_NO_DRAWUTIL
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "ntqpixmapcache.h"
 #include "ntqapplication.h"
 #include "ntqpainter.h"
diff --git a/src/kernel/qeventloop_unix.cpp b/src/kernel/qeventloop_unix.cpp
index 89e31da82..2f71b4c05 100644
--- a/src/kernel/qeventloop_unix.cpp
+++ b/src/kernel/qeventloop_unix.cpp
@@ -39,7 +39,7 @@
 #include "qeventloop_p.h" // includes qplatformdefs.h
 #include "ntqeventloop.h"
 #include "ntqapplication.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
 #include "tqmutex.h"
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/src/kernel/qeventloop_unix_glib.cpp b/src/kernel/qeventloop_unix_glib.cpp
index 5d43a6efb..11cb9ad94 100644
--- a/src/kernel/qeventloop_unix_glib.cpp
+++ b/src/kernel/qeventloop_unix_glib.cpp
@@ -39,7 +39,7 @@
 #include "qeventloop_glib_p.h" // includes qplatformdefs.h
 #include "ntqeventloop.h"
 #include "ntqapplication.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
 #include "tqmutex.h"
 
 #if defined(TQT_THREAD_SUPPORT)
diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp
index 6905bac22..bb6f343c2 100644
--- a/src/kernel/qeventloop_x11.cpp
+++ b/src/kernel/qeventloop_x11.cpp
@@ -39,7 +39,7 @@
 #include "qeventloop_p.h" // includes qplatformdefs.h
 #include "ntqeventloop.h"
 #include "ntqapplication.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
 #include "qcolor_p.h"
 #include "qt_x11_p.h"
 
diff --git a/src/kernel/qeventloop_x11_glib.cpp b/src/kernel/qeventloop_x11_glib.cpp
index b152d6a38..e000b0ef4 100644
--- a/src/kernel/qeventloop_x11_glib.cpp
+++ b/src/kernel/qeventloop_x11_glib.cpp
@@ -42,7 +42,7 @@
 #include "qeventloop_glib_p.h" // includes qplatformdefs.h
 #include "ntqeventloop.h"
 #include "ntqapplication.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
 #include "qcolor_p.h"
 #include "qt_x11_p.h"
 
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index 1ad9ccf9e..99f1dba77 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -45,8 +45,8 @@
 #include "ntqfontmetrics.h"
 #include "ntqfontinfo.h"
 #include "ntqpainter.h"
-#include "ntqdict.h"
-#include "ntqcache.h"
+#include "tqdict.h"
+#include "tqcache.h"
 #include "ntqdatastream.h"
 #include "ntqapplication.h"
 #include "ntqcleanuphandler.h"
diff --git a/src/kernel/qfontengine_p.h b/src/kernel/qfontengine_p.h
index 7d0db28c1..3dba677ca 100644
--- a/src/kernel/qfontengine_p.h
+++ b/src/kernel/qfontengine_p.h
@@ -462,7 +462,7 @@ private:
 #elif defined( TQ_WS_MAC )
 #include "qt_mac.h"
 #include <tqmap.h>
-#include <ntqcache.h>
+#include <tqcache.h>
 
 class TQFontEngineMac : public TQFontEngine
 {
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index 54bedb33e..0a8164d44 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -41,10 +41,10 @@
 // #define FONTENGINE_DEBUG
 
 #include <tqwidget.h>
-#include <ntqcstring.h>
+#include <tqcstring.h>
 #include <tqtextcodec.h>
 
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "ntqfontdatabase.h"
 #include "ntqpaintdevice.h"
 #include "ntqpaintdevicemetrics.h"
diff --git a/src/kernel/qinputcontext_p.h b/src/kernel/qinputcontext_p.h
index 984660038..0e0f8da0c 100644
--- a/src/kernel/qinputcontext_p.h
+++ b/src/kernel/qinputcontext_p.h
@@ -61,7 +61,7 @@ class TQString;
 
 
 #ifdef TQ_WS_X11
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
 #include "ntqwindowdefs.h"
 #include "qt_x11_p.h"
 #endif
diff --git a/src/kernel/qinternal_p.h b/src/kernel/qinternal_p.h
index 6b4139f32..837c81421 100644
--- a/src/kernel/qinternal_p.h
+++ b/src/kernel/qinternal_p.h
@@ -56,7 +56,7 @@
 #include "ntqnamespace.h"
 #include "ntqrect.h"
 #include "tqptrlist.h"
-#include "ntqcstring.h"
+#include "tqcstring.h"
 #include "ntqiodevice.h"
 #endif // QT_H
 
diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp
index add0df9e4..a1bf49832 100644
--- a/src/kernel/qkeysequence.cpp
+++ b/src/kernel/qkeysequence.cpp
@@ -46,7 +46,7 @@
 #include "ntqshared.h"
 #include "tqvaluelist.h"
 #ifndef TQT_NO_REGEXP
-# include "ntqregexp.h"
+# include "tqregexp.h"
 #endif
 
 #ifdef TQ_WS_MAC
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index 624c025d8..ae74503c3 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqmetaobject.h"
-#include "ntqasciidict.h"
+#include "tqasciidict.h"
 
 #ifdef TQT_THREAD_SUPPORT
 #include <private/tqmutexpool_p.h>
diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp
index 7be719725..ea6f99942 100644
--- a/src/kernel/qmovie.cpp
+++ b/src/kernel/qmovie.cpp
@@ -43,7 +43,7 @@
 #include "tqtimer.h"
 #include "ntqpainter.h"
 #include "tqptrlist.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "ntqmovie.h"
 #include "ntqfile.h"
 #include "ntqbuffer.h"
diff --git a/src/kernel/qpaintdevice_x11.cpp b/src/kernel/qpaintdevice_x11.cpp
index 1a01803aa..d40d09ba2 100644
--- a/src/kernel/qpaintdevice_x11.cpp
+++ b/src/kernel/qpaintdevice_x11.cpp
@@ -42,7 +42,7 @@
 #include "ntqpaintdevicemetrics.h"
 #include "ntqpainter.h"
 #include "tqwidget.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "ntqapplication.h"
 #include "qt_x11_p.h"
 
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index 47d2af11c..731708b77 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqpainter.h"
 #include "qpainter_p.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "tqptrstack.h"
 #include "tqptrdict.h"
 #include "ntqdatastream.h"
@@ -49,7 +49,7 @@
 #include "ntqpaintdevicemetrics.h"
 #include "ntqapplication.h"
 #include "qrichtext_p.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include "ntqcleanuphandler.h"
 #include <string.h>
 
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index 0e72d64da..f8de8c9a5 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -43,7 +43,7 @@
 #include "ntqfont.h"
 #include "ntqpainter.h"
 #include "tqwidget.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "ntqpixmapcache.h"
 #include "tqtextcodec.h"
 #include "ntqpaintdevicemetrics.h"
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index 9ac10d30c..33fca8ffd 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqpixmap.h"
 
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "tqimage.h"
 #include "tqwidget.h"
 #include "ntqpainter.h"
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp
index b40247af9..1ddb18e02 100644
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/qpixmap_x11.cpp
@@ -67,7 +67,7 @@
 #undef QT_MITSHM_XFORM
 #endif
 
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "ntqpaintdevicemetrics.h"
 #include "tqimage.h"
 #include "ntqwmatrix.h"
diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp
index 16a7c5ed2..9eb09466c 100644
--- a/src/kernel/qpixmapcache.cpp
+++ b/src/kernel/qpixmapcache.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqpixmapcache.h"
-#include "ntqcache.h"
+#include "tqcache.h"
 #include "tqobject.h"
 #include "ntqcleanuphandler.h"
 
diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp
index 0e5a2299a..a8ed9e4da 100644
--- a/src/kernel/qprocess_unix.cpp
+++ b/src/kernel/qprocess_unix.cpp
@@ -55,7 +55,7 @@
 #include "ntqsocketnotifier.h"
 #include "tqtimer.h"
 #include "ntqcleanuphandler.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include "private/qinternal_p.h"
 
 #include <stdlib.h>
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index c9ce2ea7d..b70e809df 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -62,17 +62,17 @@
 #include "tqimage.h"
 #include "tqdatetime.h"
 #include "tqstring.h"
-#include "ntqdict.h"
-#include "ntqmemarray.h"
+#include "tqdict.h"
+#include "tqmemarray.h"
 #include "ntqfile.h"
 #include "ntqbuffer.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
 #include "tqtextcodec.h"
 #include "ntqsettings.h"
 #include "tqmap.h"
 #include "ntqfontdatabase.h"
-#include "ntqregexp.h"
-#include "ntqbitmap.h"
+#include "tqregexp.h"
+#include "tqbitmap.h"
 #include <private/qunicodetables_p.h>
 
 #if defined(Q_OS_WIN32)
diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp
index 30d0fe9c2..55a7d8380 100644
--- a/src/kernel/qregion_x11.cpp
+++ b/src/kernel/qregion_x11.cpp
@@ -42,7 +42,7 @@
 #include "ntqpointarray.h"
 #include "ntqbuffer.h"
 #include "tqimage.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "qt_x11_p.h"
 
 #include <stdlib.h>
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index a1dfd6719..0228a58fe 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -6694,7 +6694,7 @@ void TQTextImage::adjustToPainter( TQPainter* p )
 }
 
 #if !defined(TQ_WS_X11)
-#include <ntqbitmap.h>
+#include <tqbitmap.h>
 #include <ntqcleanuphandler.h>
 static TQPixmap *qrt_selection = 0;
 static TQSingleCleanupHandler<TQPixmap> qrt_cleanup_pixmap;
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index c8c68360e..e9422ec14 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -58,7 +58,7 @@
 #include "tqptrlist.h"
 #include "ntqrect.h"
 #include "ntqfontmetrics.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
 #include "tqmap.h"
 #include "tqstringlist.h"
 #include "ntqfont.h"
@@ -67,7 +67,7 @@
 #include "tqvaluelist.h"
 #include "tqvaluestack.h"
 #include "tqobject.h"
-#include "ntqdict.h"
+#include "tqdict.h"
 #include "ntqpixmap.h"
 #include "tqstylesheet.h"
 #include "tqptrvector.h"
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index 6a6cce7ef..eca64009e 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -9,7 +9,7 @@ kernel {
 		  $$KERNEL_P/qapplication_p.h \
 		  $$KERNEL_H/ntqasyncimageio.h \
 		  $$KERNEL_H/ntqasyncio.h \
-		  $$KERNEL_H/ntqbitmap.h \
+		  $$KERNEL_H/tqbitmap.h \
 		  $$KERNEL_H/ntqbrush.h \
 		  $$KERNEL_H/ntqclipboard.h \
 		  $$KERNEL_H/ntqcolor.h \
@@ -199,7 +199,7 @@ kernel {
 		  $$KERNEL_CPP/qapplication.cpp \
 		  $$KERNEL_CPP/qasyncimageio.cpp \
 		  $$KERNEL_CPP/qasyncio.cpp \
-		  $$KERNEL_CPP/qbitmap.cpp \
+		  $$KERNEL_CPP/tqbitmap.cpp \
 		  $$KERNEL_CPP/qclipboard.cpp \
 		  $$KERNEL_CPP/qcolor.cpp \
 		  $$KERNEL_CPP/qcolor_p.cpp \
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index aff826dc0..8222ec592 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -24,7 +24,7 @@
 #include <tqmap.h>		    // I must be first!
 #include <private/qucomextra_p.h>  // All moc genereated code has this include
 #include <ntqapplication.h>
-#include <ntqbitmap.h>
+#include <tqbitmap.h>
 #include <ntqcursor.h>
 #include <tqdatetime.h>
 #include <ntqglobal.h>
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp
index ce01453fe..42c741e8a 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/qtranslator.cpp
@@ -58,7 +58,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 
 #include "ntqfileinfo.h"
 #include "tqwidgetlist.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
 #include "tqstring.h"
 #include "ntqapplication.h"
 #include "ntqfile.h"
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index 0b2cd0f3f..1de08c389 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -43,7 +43,7 @@
 #include "ntqvariant.h"
 #ifndef TQT_NO_VARIANT
 #include "tqstring.h"
-#include "ntqcstring.h"
+#include "tqcstring.h"
 #include "ntqfont.h"
 #include "ntqpixmap.h"
 #include "tqimage.h"
@@ -57,12 +57,12 @@
 #include "ntqdatastream.h"
 #include "ntqregion.h"
 #include "ntqpointarray.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "ntqcursor.h"
 #include "tqdatetime.h"
 #include "tqsizepolicy.h"
 #include "ntqshared.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
 #include "ntqkeysequence.h"
 #include "ntqpen.h"
 
diff --git a/src/kernel/qbitmap.cpp b/src/kernel/tqbitmap.cpp
index 3c64c22b0..c23116d0e 100644
--- a/src/kernel/qbitmap.cpp
+++ b/src/kernel/tqbitmap.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "tqimage.h"
 
 
 /*!
-    \class TQBitmap ntqbitmap.h
+    \class TQBitmap tqbitmap.h
     \brief The TQBitmap class provides monochrome (1-bit depth) pixmaps.
 
     \ingroup graphics
diff --git a/src/kernel/ntqbitmap.h b/src/kernel/tqbitmap.h
index 22307b551..22307b551 100644
--- a/src/kernel/ntqbitmap.h
+++ b/src/kernel/tqbitmap.h
diff --git a/src/kernel/tqdragobject.cpp b/src/kernel/tqdragobject.cpp
index 77e726477..68678e7d6 100644
--- a/src/kernel/tqdragobject.cpp
+++ b/src/kernel/tqdragobject.cpp
@@ -52,7 +52,7 @@
 #include "tqwidget.h"
 #include "ntqbuffer.h"
 #include "ntqgif.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include "ntqdir.h"
 #include <ctype.h>
 
diff --git a/src/kernel/tqiconset.cpp b/src/kernel/tqiconset.cpp
index 6bbf4c17a..f3e8ac123 100644
--- a/src/kernel/tqiconset.cpp
+++ b/src/kernel/tqiconset.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_ICONSET
 
 #include "ntqapplication.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "ntqcleanuphandler.h"
 #include "tqimage.h"
 #include "ntqpainter.h"
diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp
index d7bc30d49..5f45e2fdc 100644
--- a/src/kernel/tqimage.cpp
+++ b/src/kernel/tqimage.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "tqimage.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include "ntqfile.h"
 #include "ntqdatastream.h"
 #include "tqtextstream.h"
@@ -3878,7 +3878,7 @@ static TQImageHandler *get_image_handler( const char *format )
 
 /*!
     Defines an image I/O handler for the image format called \a
-    format, which is recognized using the \link ntqregexp.html#details
+    format, which is recognized using the \link tqregexp.html#details
     regular expression\endlink \a header, read using \a readImage and
     written using \a writeImage.
 
diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp
index 3923b46d0..293f374e5 100644
--- a/src/kernel/tqobject.cpp
+++ b/src/kernel/tqobject.cpp
@@ -43,7 +43,7 @@
 #include "tqobject.h"
 #include "tqobjectlist.h"
 #include "ntqsignalslotimp.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include "ntqmetaobject.h"
 #include <private/qucom_p.h>
 #include "qucomextra_p.h"
diff --git a/src/kernel/tqobjectdict.h b/src/kernel/tqobjectdict.h
index 4ee49faf2..8ff8c31f4 100644
--- a/src/kernel/tqobjectdict.h
+++ b/src/kernel/tqobjectdict.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqmetaobject.h"
-#include "ntqasciidict.h"
+#include "tqasciidict.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/tqstyle.cpp b/src/kernel/tqstyle.cpp
index b3c496da6..47755c4ba 100644
--- a/src/kernel/tqstyle.cpp
+++ b/src/kernel/tqstyle.cpp
@@ -42,7 +42,7 @@
 #ifndef TQT_NO_STYLE
 #include "ntqapplication.h"
 #include "ntqpainter.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "ntqpixmapcache.h"
 #include "ntqframe.h"
 #include "ntqlayout.h"
diff --git a/src/kernel/tqstylesheet.h b/src/kernel/tqstylesheet.h
index 1c12775cc..4880726a0 100644
--- a/src/kernel/tqstylesheet.h
+++ b/src/kernel/tqstylesheet.h
@@ -45,7 +45,7 @@
 #include "tqstring.h"
 #include "tqvaluelist.h"
 #include "tqptrvector.h"
-#include "ntqdict.h"
+#include "tqdict.h"
 #include "tqobject.h"
 #endif // QT_H
 
diff --git a/src/kernel/tqttdeintegration_x11.cpp b/src/kernel/tqttdeintegration_x11.cpp
index b3565b3d4..cf96ba280 100644
--- a/src/kernel/tqttdeintegration_x11.cpp
+++ b/src/kernel/tqttdeintegration_x11.cpp
@@ -7,7 +7,7 @@
 #include <ntqfiledialog.h>
 #include <ntqfontdialog.h>
 #include <ntqlibrary.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <ntqmessagebox.h>
 #include <stdlib.h>
 
diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index bc31e7e75..c3a54d3d8 100644
--- a/src/kernel/tqwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -43,7 +43,7 @@
 #include "ntqnamespace.h"
 #include "ntqpaintdevicemetrics.h"
 #include "ntqpainter.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
 #include "tqimage.h"
 #include "tqobjectlist.h"
 #include "ntqlayout.h"
diff --git a/src/kernel/tqwidgetintdict.h b/src/kernel/tqwidgetintdict.h
index 8a4694804..4f001d7ec 100644
--- a/src/kernel/tqwidgetintdict.h
+++ b/src/kernel/tqwidgetintdict.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqwidget.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
 #endif // QT_H