Rename ptr nt* related files to equivalent tq*

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

90 files changed, 111 insertions, 111 deletions

diff --git a/src/canvas/tqcanvas.cpp b/src/canvas/tqcanvas.cpp
index cd03790a4..6e1db596b 100644
--- a/src/canvas/tqcanvas.cpp
+++ b/src/canvas/tqcanvas.cpp
@@ -43,7 +43,7 @@
 #include "ntqapplication.h"
 #include "ntqbitmap.h"
 #include "ntqimage.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include "ntqpainter.h"
 #include "ntqpolygonscanner.h"
 #include "ntqtimer.h"
diff --git a/src/canvas/tqcanvas.h b/src/canvas/tqcanvas.h
index 744f21f53..2a8475247 100644
--- a/src/canvas/tqcanvas.h
+++ b/src/canvas/tqcanvas.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqscrollview.h"
 #include "ntqpixmap.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqbrush.h"
 #include "ntqpen.h"
 #include "tqvaluelist.h"
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index 8812f2102..911b22c28 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -82,7 +82,7 @@
 #include "ntqpainter.h"
 #include "ntqpopupmenu.h"
 #include "ntqprogressbar.h"
-#include "ntqptrvector.h"
+#include "tqptrvector.h"
 #include "ntqpushbutton.h"
 #include "ntqregexp.h"
 #include "ntqsplitter.h"
diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp
index 9e1d31a7f..e5b3f8f46 100644
--- a/src/dialogs/qwizard.cpp
+++ b/src/dialogs/qwizard.cpp
@@ -48,7 +48,7 @@
 #include "ntqlabel.h"
 #include "tqwidgetstack.h"
 #include "ntqapplication.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqpainter.h"
 #include "ntqaccel.h"
 
diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h
index a37c01670..f782c1f7c 100644
--- a/src/kernel/ntqinputcontext.h
+++ b/src/kernel/ntqinputcontext.h
@@ -43,7 +43,7 @@
 #include "ntqglobal.h"
 #include "ntqevent.h"
 #include "ntqstring.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #endif
 
 class TQWidget;
diff --git a/src/kernel/ntqmime.h b/src/kernel/ntqmime.h
index 50ed27994..00c31a375 100644
--- a/src/kernel/ntqmime.h
+++ b/src/kernel/ntqmime.h
@@ -125,7 +125,7 @@ private:
 #if defined(TQ_WS_WIN)
 
 #ifndef QT_H
-#include "ntqptrlist.h" // down here for GCC 2.7.* compatibility
+#include "tqptrlist.h" // down here for GCC 2.7.* compatibility
 #endif // QT_H
 
 /*
@@ -161,7 +161,7 @@ public:
 #if defined(TQ_WS_MAC)
 
 #ifndef QT_H
-#include "ntqptrlist.h" // down here for GCC 2.7.* compatibility
+#include "tqptrlist.h" // down here for GCC 2.7.* compatibility
 #endif // QT_H
 
 /*
diff --git a/src/kernel/ntqsignalslotimp.h b/src/kernel/ntqsignalslotimp.h
index 375f8eaa8..80c18b5d2 100644
--- a/src/kernel/ntqsignalslotimp.h
+++ b/src/kernel/ntqsignalslotimp.h
@@ -43,8 +43,8 @@
 
 #ifndef QT_H
 #include "ntqconnection.h"
-#include "ntqptrlist.h"
-#include "ntqptrvector.h"
+#include "tqptrlist.h"
+#include "tqptrvector.h"
 #endif // QT_H
 
 class TQ_EXPORT TQConnectionList : public TQPtrList<TQConnection>
diff --git a/src/kernel/ntqstylesheet.h b/src/kernel/ntqstylesheet.h
index d11548744..dbf5fd6ef 100644
--- a/src/kernel/ntqstylesheet.h
+++ b/src/kernel/ntqstylesheet.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqstring.h"
 #include "tqvaluelist.h"
-#include "ntqptrvector.h"
+#include "tqptrvector.h"
 #include "ntqdict.h"
 #include "tqobject.h"
 #endif // QT_H
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index eef4df773..fd10a18b0 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -18,7 +18,7 @@
 #include "ntqglobal.h"
 #include "ntqfeatures.h"
 #include "ntqshared.h"
-#include "ntqptrcollection.h"
+#include "tqptrcollection.h"
 #include "ntqglist.h"
 #include "tqobjectdefs.h"
 #include "ntqnamespace.h"
@@ -26,7 +26,7 @@
 #include "ntqmemarray.h"
 #include "ntqcstring.h"
 #include "ntqstring.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqiodevice.h"
 #include "ntqkeysequence.h"
 #include "ntqwindowdefs.h"
@@ -135,7 +135,7 @@
 #include <ntqmotifplusstyle.h>
 #include <ntqcdestyle.h>
 #include <ntqmovie.h>
-#include "ntqptrvector.h"
+#include "tqptrvector.h"
 #include "ntqmutex.h"
 #include <ntqnetwork.h>
 #include <ntqftp.h>
@@ -164,10 +164,10 @@
 #include <ntqprocess.h>
 #include "ntqprogressbar.h"
 #include <ntqasciicache.h>
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include <ntqcleanuphandler.h>
-#include <ntqptrqueue.h>
-#include <ntqptrstack.h>
+#include <tqptrqueue.h>
+#include <tqptrstack.h>
 #include "ntqstylesheet.h"
 #include <ntqpushbutton.h>
 #include <ntqradiobutton.h>
diff --git a/src/kernel/ntqurloperator.h b/src/kernel/ntqurloperator.h
index 986fb25aa..f290b37f3 100644
--- a/src/kernel/ntqurloperator.h
+++ b/src/kernel/ntqurloperator.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqobject.h"
 #include "ntqurl.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqnetworkprotocol.h"
 #include "ntqstringlist.h" // TQString->TQStringList conversion
 #endif // QT_H
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index beb504052..8b37b92ef 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -45,7 +45,7 @@
 #include "ntqsignal.h"
 #include "ntqapplication.h"
 #include "tqwidget.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqwhatsthis.h"
 #include "ntqguardedptr.h"
 #include "ntqstatusbar.h"
diff --git a/src/kernel/qaccessible.cpp b/src/kernel/qaccessible.cpp
index 8306faa0a..d486607ca 100644
--- a/src/kernel/qaccessible.cpp
+++ b/src/kernel/qaccessible.cpp
@@ -40,7 +40,7 @@
 
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include "ntqmetaobject.h"
 #include <private/qpluginmanager_p.h>
 #include "ntqapplication.h"
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 39f8abc5a..e5b28642b 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -45,7 +45,7 @@
 #include "tqwidget.h"
 #include "tqwidgetlist.h"
 #include "tqwidgetintdict.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include "ntqcleanuphandler.h"
 
 #include "ntqtranslator.h"
diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/qasyncimageio.cpp
index 8605c79ad..c89036719 100644
--- a/src/kernel/qasyncimageio.cpp
+++ b/src/kernel/qasyncimageio.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_ASYNC_IMAGE_IO
 
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqgif.h"
 #include <stdlib.h>
 
diff --git a/src/kernel/qeventloop_glib_p.h b/src/kernel/qeventloop_glib_p.h
index b5dbbada1..f3711b62c 100644
--- a/src/kernel/qeventloop_glib_p.h
+++ b/src/kernel/qeventloop_glib_p.h
@@ -63,7 +63,7 @@
 
 class TQSocketNotifier;
 
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 
 #include <glib.h>
 
diff --git a/src/kernel/qeventloop_p.h b/src/kernel/qeventloop_p.h
index d0e00f669..8ab5f954f 100644
--- a/src/kernel/qeventloop_p.h
+++ b/src/kernel/qeventloop_p.h
@@ -70,7 +70,7 @@ class TQMacSockNotPrivate;
 #endif
 
 #if defined(Q_OS_UNIX) || defined (TQ_WS_WIN)
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #endif // Q_OS_UNIX || TQ_WS_WIN
 
 #if defined(Q_OS_UNIX)
diff --git a/src/kernel/qfontengine_p.h b/src/kernel/qfontengine_p.h
index 09fa32001..17aa618b6 100644
--- a/src/kernel/qfontengine_p.h
+++ b/src/kernel/qfontengine_p.h
@@ -43,7 +43,7 @@
 
 #ifdef TQ_WS_WIN
 #include "qt_windows.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #endif
 
 #include "qtextengine_p.h"
diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp
index 1097a5f80..3d7c15bfa 100644
--- a/src/kernel/qimage.cpp
+++ b/src/kernel/qimage.cpp
@@ -44,7 +44,7 @@
 #include "ntqdatastream.h"
 #include "ntqtextstream.h"
 #include "ntqbuffer.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqasyncimageio.h"
 #include "ntqpngio.h"
 #include "ntqmngio.h"
diff --git a/src/kernel/qinternal_p.h b/src/kernel/qinternal_p.h
index e8142c8f5..6b4139f32 100644
--- a/src/kernel/qinternal_p.h
+++ b/src/kernel/qinternal_p.h
@@ -55,7 +55,7 @@
 #ifndef QT_H
 #include "ntqnamespace.h"
 #include "ntqrect.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqcstring.h"
 #include "ntqiodevice.h"
 #endif // QT_H
diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp
index 229a9ed7d..6fd85c407 100644
--- a/src/kernel/qlayout.cpp
+++ b/src/kernel/qlayout.cpp
@@ -44,7 +44,7 @@
 
 #include "ntqapplication.h"
 #include "tqwidget.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqsizepolicy.h"
 
 #include "qlayoutengine_p.h"
diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp
index 2f83cabff..cccfff435 100644
--- a/src/kernel/qmovie.cpp
+++ b/src/kernel/qmovie.cpp
@@ -42,7 +42,7 @@
 
 #include "ntqtimer.h"
 #include "ntqpainter.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqbitmap.h"
 #include "ntqmovie.h"
 #include "ntqfile.h"
diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp
index b8ad2b55d..8d7ff8f1a 100644
--- a/src/kernel/qnetworkprotocol.cpp
+++ b/src/kernel/qnetworkprotocol.cpp
@@ -46,7 +46,7 @@
 #include "ntqurloperator.h"
 #include "ntqtimer.h"
 #include "tqmap.h"
-#include "ntqptrqueue.h"
+#include "tqptrqueue.h"
 
 //#define TQNETWORKPROTOCOL_DEBUG
 #define NETWORK_OP_DELAY 1000
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index 3e3574dff..da78db89f 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -41,8 +41,8 @@
 #include "ntqpainter.h"
 #include "qpainter_p.h"
 #include "ntqbitmap.h"
-#include "ntqptrstack.h"
-#include "ntqptrdict.h"
+#include "tqptrstack.h"
+#include "tqptrdict.h"
 #include "ntqdatastream.h"
 #include "tqwidget.h"
 #include "ntqimage.h"
diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp
index 6d0f27abf..87f76848d 100644
--- a/src/kernel/qprocess_unix.cpp
+++ b/src/kernel/qprocess_unix.cpp
@@ -50,8 +50,8 @@
 #ifndef TQT_NO_PROCESS
 
 #include "ntqapplication.h"
-#include "ntqptrqueue.h"
-#include "ntqptrlist.h"
+#include "tqptrqueue.h"
+#include "tqptrlist.h"
 #include "ntqsocketnotifier.h"
 #include "ntqtimer.h"
 #include "ntqcleanuphandler.h"
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index a2ab4d0e0..a74433d47 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -58,8 +58,8 @@
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqcursor.h"
-#include "ntqptrstack.h"
-#include "ntqptrdict.h"
+#include "tqptrstack.h"
+#include "tqptrdict.h"
 #include "ntqstyle.h"
 #include "ntqcleanuphandler.h"
 #include "qtextengine_p.h"
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index 874e61557..1d0c7627c 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -55,7 +55,7 @@
 
 #ifndef QT_H
 #include "ntqstring.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqrect.h"
 #include "ntqfontmetrics.h"
 #include "ntqintdict.h"
@@ -70,7 +70,7 @@
 #include "ntqdict.h"
 #include "ntqpixmap.h"
 #include "ntqstylesheet.h"
-#include "ntqptrvector.h"
+#include "tqptrvector.h"
 #include "ntqpainter.h"
 #include "ntqlayout.h"
 #include "tqobject.h"
diff --git a/src/kernel/qsignalmapper.cpp b/src/kernel/qsignalmapper.cpp
index 8efd27371..aff53a3c2 100644
--- a/src/kernel/qsignalmapper.cpp
+++ b/src/kernel/qsignalmapper.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsignalmapper.h"
 #ifndef TQT_NO_SIGNALMAPPER
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 
 struct TQSignalMapperRec {
     TQSignalMapperRec()
diff --git a/src/kernel/qsound.cpp b/src/kernel/qsound.cpp
index 98d210427..adfdf84ee 100644
--- a/src/kernel/qsound.cpp
+++ b/src/kernel/qsound.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_SOUND
 
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 
 static TQPtrList<TQAuServer> *servers=0;
 
diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp
index 2eaf0b46b..11d34e476 100644
--- a/src/kernel/qsound_x11.cpp
+++ b/src/kernel/qsound_x11.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_SOUND
 
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include "ntqsocketnotifier.h"
 #include "ntqapplication.h"
 
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index 3e5224ae6..54b968234 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -34,7 +34,7 @@
 #include <ntqpainter.h>
 #include <ntqpixmap.h>
 #include <qplatformdefs.h>
-#include <ntqptrlist.h>
+#include <tqptrlist.h>
 #include <ntqstring.h>
 #include <ntqstringlist.h>
 #include <ntqstyle.h>
diff --git a/src/kernel/qurloperator.cpp b/src/kernel/qurloperator.cpp
index e5b84ca51..5dc39e29c 100644
--- a/src/kernel/qurloperator.cpp
+++ b/src/kernel/qurloperator.cpp
@@ -46,7 +46,7 @@
 #include "ntqnetworkprotocol.h"
 #include "tqmap.h"
 #include "ntqdir.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include "ntqguardedptr.h"
 
 //#define TQURLOPERATOR_DEBUG
diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp
index d66f8cf16..b87fd8d07 100644
--- a/src/kernel/tqobject.cpp
+++ b/src/kernel/tqobject.cpp
@@ -47,7 +47,7 @@
 #include "ntqmetaobject.h"
 #include <private/qucom_p.h>
 #include "qucomextra_p.h"
-#include "ntqptrvector.h"
+#include "tqptrvector.h"
 
 // TQStyleControlElementData
 #include "ntqstyle.h"
diff --git a/src/kernel/tqobjectlist.h b/src/kernel/tqobjectlist.h
index 830a32e33..c7a965444 100644
--- a/src/kernel/tqobjectlist.h
+++ b/src/kernel/tqobjectlist.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp
index 9345c31e4..118429a11 100644
--- a/src/kernel/tqwidget.cpp
+++ b/src/kernel/tqwidget.cpp
@@ -43,7 +43,7 @@
 #include "tqwidget.h"
 #include "tqwidgetlist.h"
 #include "tqwidgetintdict.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include "ntqfocusdata.h"
 #include "ntqcursor.h"
 #include "ntqpixmap.h"
diff --git a/src/kernel/tqwidgetlist.h b/src/kernel/tqwidgetlist.h
index bcd7637cf..fe03669c7 100644
--- a/src/kernel/tqwidgetlist.h
+++ b/src/kernel/tqwidgetlist.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqwidget.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #endif // QT_H
 
 class TQ_EXPORT TQWidgetList : public TQPtrList<TQWidget>
diff --git a/src/moc/moc.pro b/src/moc/moc.pro
index 6871d9d93..f053ae338 100644
--- a/src/moc/moc.pro
+++ b/src/moc/moc.pro
@@ -13,7 +13,7 @@ DEPENDPATH	+= $$QT_SOURCE_TREE/include ../tools .
 LIBS		=
 OBJECTS_DIR	= .
 SOURCES		= ../tools/qbuffer.cpp	    \
-		  ../tools/qptrcollection.cpp  \
+		  ../tools/tqptrcollection.cpp  \
 		  ../tools/qcstring.cpp	    \
 		  ../tools/qdatastream.cpp  \
 		  ../tools/qdatetime.cpp    \
diff --git a/src/moc/moc.y b/src/moc/moc.y
index 796647595..222ff3f27 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -64,7 +64,7 @@ void yyerror( const char *msg );
 #include "ntqdict.h"
 #include "ntqfile.h"
 #include "ntqdir.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqregexp.h"
 #include "ntqstrlist.h"
 #ifdef MOC_MWERKS_PLUGIN
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index d6b97ad85..07406ceda 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -77,7 +77,7 @@ void yyerror( const char *msg );
 #include "ntqdict.h"
 #include "ntqfile.h"
 #include "ntqdir.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqregexp.h"
 #include "ntqstrlist.h"
 #ifdef MOC_MWERKS_PLUGIN
diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp
index b1eeaa53f..db93c4e92 100644
--- a/src/network/qdns.cpp
+++ b/src/network/qdns.cpp
@@ -66,13 +66,13 @@
 
 #include "ntqdatetime.h"
 #include "ntqdict.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqstring.h"
 #include "ntqtimer.h"
 #include "ntqapplication.h"
-#include "ntqptrvector.h"
+#include "tqptrvector.h"
 #include "ntqstrlist.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include "ntqfile.h"
 #include "ntqtextstream.h"
 #include "ntqsocketdevice.h"
diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp
index 7a23afbf6..bdbfe47b5 100644
--- a/src/network/qftp.cpp
+++ b/src/network/qftp.cpp
@@ -50,7 +50,7 @@
 #include "ntqregexp.h"
 #include "ntqtimer.h"
 #include "ntqfileinfo.h"
-#include "ntqptrdict.h" // binary compatibility
+#include "tqptrdict.h" // binary compatibility
 
 #ifndef TQT_NO_TEXTCODEC
 #include "ntqtextcodec.h"
diff --git a/src/network/qsocket.cpp b/src/network/qsocket.cpp
index 381a1a8e6..687c13f90 100644
--- a/src/network/qsocket.cpp
+++ b/src/network/qsocket.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsocket.h"
 #ifndef TQT_NO_NETWORK
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqtimer.h"
 #include "ntqsocketdevice.h"
 #include "ntqdns.h"
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 83b27a0c3..6882259d8 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -43,7 +43,7 @@
 #include "ntqpaintdevicemetrics.h"
 #include "ntqimage.h"
 #include "ntqcleanuphandler.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 
 static TQGLFormat* qgl_default_format = 0;
 static TQGLFormat* qgl_default_overlay_format = 0;
diff --git a/src/sql/drivers/cache/tqsqlcachedresult.h b/src/sql/drivers/cache/tqsqlcachedresult.h
index 3542a1749..11aa63d99 100644
--- a/src/sql/drivers/cache/tqsqlcachedresult.h
+++ b/src/sql/drivers/cache/tqsqlcachedresult.h
@@ -53,7 +53,7 @@
 
 #include <ntqglobal.h>
 #include <ntqvariant.h>
-#include <ntqptrvector.h>
+#include <tqptrvector.h>
 #include <tqvaluevector.h>
 #include <tqsqlresult.h>
 
diff --git a/src/sql/drivers/sqlite/tqsql_sqlite.cpp b/src/sql/drivers/sqlite/tqsql_sqlite.cpp
index 3f0053d39..4b7191bb4 100644
--- a/src/sql/drivers/sqlite/tqsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/tqsql_sqlite.cpp
@@ -17,7 +17,7 @@
 #include <ntqdatetime.h>
 #include <ntqregexp.h>
 #include <ntqfile.h>
-#include <ntqptrvector.h>
+#include <tqptrvector.h>
 #if !defined TQ_WS_WIN32
 #  include <unistd.h>
 #endif
diff --git a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
index afa21ac86..ec577c873 100644
--- a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
+++ b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
@@ -19,7 +19,7 @@
 #include <ntqregexp.h>
 #include <ntqfile.h>
 #include <sqlite3.h>
-#include <ntqptrvector.h>
+#include <tqptrvector.h>
 #if !defined TQ_WS_WIN32
 #  include <unistd.h>
 #endif
diff --git a/src/sql/tqsqldriver.h b/src/sql/tqsqldriver.h
index ba865f099..10548880c 100644
--- a/src/sql/tqsqldriver.h
+++ b/src/sql/tqsqldriver.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include "ntqstring.h"
 #include "tqsqlerror.h"
 #include "tqsqlquery.h"
diff --git a/src/table/ntqtable.h b/src/table/ntqtable.h
index 490909e1c..0e890df2c 100644
--- a/src/table/ntqtable.h
+++ b/src/table/ntqtable.h
@@ -44,10 +44,10 @@
 #ifndef QT_H
 #include "ntqscrollview.h"
 #include "ntqpixmap.h"
-#include "ntqptrvector.h"
+#include "tqptrvector.h"
 #include "ntqheader.h"
 #include "ntqmemarray.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqguardedptr.h"
 #include "ntqshared.h"
 #include "ntqintdict.h"
diff --git a/src/tools/ntqcleanuphandler.h b/src/tools/ntqcleanuphandler.h
index e1dc339b3..b6347f7ea 100644
--- a/src/tools/ntqcleanuphandler.h
+++ b/src/tools/ntqcleanuphandler.h
@@ -40,7 +40,7 @@
 #define TQCLEANUPHANDLER_H
 
 #ifndef QT_H
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #endif // QT_H
 
 template<class Type>
diff --git a/src/tools/ntqgcache.h b/src/tools/ntqgcache.h
index cbcb0723f..9082af762 100644
--- a/src/tools/ntqgcache.h
+++ b/src/tools/ntqgcache.h
@@ -42,7 +42,7 @@
 #define TQGCACHE_H
 
 #ifndef QT_H
-#include "ntqptrcollection.h"
+#include "tqptrcollection.h"
 #include "ntqglist.h"
 #include "ntqgdict.h"
 #endif // QT_H
diff --git a/src/tools/ntqgdict.h b/src/tools/ntqgdict.h
index c3f8fb365..0e29a51eb 100644
--- a/src/tools/ntqgdict.h
+++ b/src/tools/ntqgdict.h
@@ -42,7 +42,7 @@
 #define TQGDICT_H
 
 #ifndef QT_H
-#include "ntqptrcollection.h"
+#include "tqptrcollection.h"
 #include "ntqstring.h"
 #endif // QT_H
 
diff --git a/src/tools/ntqglist.h b/src/tools/ntqglist.h
index 247c4f68f..95a5786d3 100644
--- a/src/tools/ntqglist.h
+++ b/src/tools/ntqglist.h
@@ -42,7 +42,7 @@
 #define TQGLIST_H
 
 #ifndef QT_H
-#include "ntqptrcollection.h"
+#include "tqptrcollection.h"
 #endif // QT_H
 
 class TQ_EXPORT TQLNode
diff --git a/src/tools/ntqgvector.h b/src/tools/ntqgvector.h
index 4702c0e4a..d1e8385df 100644
--- a/src/tools/ntqgvector.h
+++ b/src/tools/ntqgvector.h
@@ -42,7 +42,7 @@
 #define TQGVECTOR_H
 
 #ifndef QT_H
-#include "ntqptrcollection.h"
+#include "tqptrcollection.h"
 #endif // QT_H
 
 
diff --git a/src/tools/ntqstrlist.h b/src/tools/ntqstrlist.h
index 2495f55a5..e8eb3d3f3 100644
--- a/src/tools/ntqstrlist.h
+++ b/src/tools/ntqstrlist.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqstring.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqdatastream.h"
 #endif // QT_H
 
diff --git a/src/tools/ntqstrvec.h b/src/tools/ntqstrvec.h
index 9f2245081..82fea5e97 100644
--- a/src/tools/ntqstrvec.h
+++ b/src/tools/ntqstrvec.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqstring.h"
-#include "ntqptrvector.h"
+#include "tqptrvector.h"
 #include "ntqdatastream.h"
 #endif // QT_H
 
diff --git a/src/tools/qgcache.cpp b/src/tools/qgcache.cpp
index 07a91fd26..9cde4b24e 100644
--- a/src/tools/qgcache.cpp
+++ b/src/tools/qgcache.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqgcache.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqdict.h"
 #include "ntqstring.h"
 
diff --git a/src/tools/qgdict.cpp b/src/tools/qgdict.cpp
index fe68644cb..639014870 100644
--- a/src/tools/qgdict.cpp
+++ b/src/tools/qgdict.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqgdict.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqstring.h"
 #include "ntqdatastream.h"
 #include <ctype.h>
diff --git a/src/tools/qgpluginmanager.cpp b/src/tools/qgpluginmanager.cpp
index dc72dad30..3a7c321fd 100644
--- a/src/tools/qgpluginmanager.cpp
+++ b/src/tools/qgpluginmanager.cpp
@@ -287,7 +287,7 @@ static int similarity( const TQString& s1, const TQString& s2 )
 
 
 
-#include <ntqptrlist.h>
+#include <tqptrlist.h>
 
 TQGPluginManager::TQGPluginManager( const TQUuid& id, const TQStringList& paths, const TQString &suffix, bool cs )
     : interfaceId( id ), plugDict( 17, cs ), casesens( cs ), autounload( TRUE )
diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp
index 19b983f75..ab6f0ee89 100644
--- a/src/tools/qregexp.cpp
+++ b/src/tools/qregexp.cpp
@@ -48,7 +48,7 @@
 #include "ntqcleanuphandler.h"
 #include "ntqintdict.h"
 #include "tqmap.h"
-#include "ntqptrvector.h"
+#include "tqptrvector.h"
 #include "ntqstring.h"
 #include "ntqtl.h"
 
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index 5026f3791..e5e7a7af4 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -36,21 +36,21 @@ tools {
 		  $$TOOLS_P/qlibrary_p.h \
 		  $$TOOLS_H/ntqlocale.h \
 		  $$TOOLS_P/qlocale_p.h \
-		  $$TOOLS_H/ntqptrlist.h \
+		  $$TOOLS_H/tqptrlist.h \
 		  $$TOOLS_H/tqmap.h \
 		  $$TOOLS_H/ntqmutex.h \
 		  $$TOOLS_P/qmutex_p.h \
 		  $$TOOLS_P/qmutexpool_p.h \
 		  $$TOOLS_P/qpluginmanager_p.h \
-		  $$TOOLS_H/ntqptrcollection.h \
-		  $$TOOLS_H/ntqptrdict.h \
-		  $$TOOLS_H/ntqptrqueue.h \
+		  $$TOOLS_H/tqptrcollection.h \
+		  $$TOOLS_H/tqptrdict.h \
+		  $$TOOLS_H/tqptrqueue.h \
 		  $$TOOLS_H/ntqregexp.h \
 		  $$TOOLS_H/ntqsemaphore.h \
 		  $$TOOLS_H/ntqsettings.h \
 		  $$TOOLS_P/qsettings_p.h \
 		  $$TOOLS_H/ntqshared.h \
-		  $$TOOLS_H/ntqptrstack.h \
+		  $$TOOLS_H/tqptrstack.h \
 		  $$TOOLS_H/ntqstring.h \
 		  $$TOOLS_H/ntqstringlist.h \
 		  $$TOOLS_H/ntqstrlist.h \
@@ -59,7 +59,7 @@ tools {
 		  $$TOOLS_P/qthreadinstance_p.h \
 		  $$TOOLS_H/ntqthreadstorage.h\
 		  $$TOOLS_P/qunicodetables_p.h \
-		  $$TOOLS_H/ntqptrvector.h \
+		  $$TOOLS_H/tqptrvector.h \
 	          $$TOOLS_H/tqvaluelist.h \
 		  $$TOOLS_H/tqvaluestack.h \
 		  $$TOOLS_H/tqvaluevector.h \
@@ -129,7 +129,7 @@ tools {
 		  $$TOOLS_CPP/qlocale.cpp \
 		  $$TOOLS_CPP/tqmap.cpp \
 		  $$TOOLS_CPP/qmutexpool.cpp \
-		  $$TOOLS_CPP/qptrcollection.cpp \
+		  $$TOOLS_CPP/tqptrcollection.cpp \
 		  $$TOOLS_CPP/qregexp.cpp \
 		  $$TOOLS_CPP/qstring.cpp \
 		  $$TOOLS_CPP/qsemaphore.cpp \
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index 244db1cea..12d8832da 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/qwinexport.cpp
@@ -22,8 +22,8 @@
 #include <ntqlibrary.h>
 #include <tqmap.h>
 #include <ntqmemarray.h>
-#include <ntqptrlist.h>
-#include <ntqptrvector.h>
+#include <tqptrlist.h>
+#include <tqptrvector.h>
 #include <ntqstring.h>
 #include <tqvaluelist.h>
 #include <tqvaluevector.h>
diff --git a/src/tools/qptrcollection.cpp b/src/tools/tqptrcollection.cpp
index 718a739d1..7a9258c5e 100644
--- a/src/tools/qptrcollection.cpp
+++ b/src/tools/tqptrcollection.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "ntqptrcollection.h"
+#include "tqptrcollection.h"
 
 /*!
-    \class TQPtrCollection ntqptrcollection.h
+    \class TQPtrCollection tqptrcollection.h
     \reentrant
     \brief The TQPtrCollection class is the base class of most pointer-based TQt collections.
 
diff --git a/src/tools/ntqptrcollection.h b/src/tools/tqptrcollection.h
index da6fc6670..da6fc6670 100644
--- a/src/tools/ntqptrcollection.h
+++ b/src/tools/tqptrcollection.h
diff --git a/src/tools/ntqptrdict.h b/src/tools/tqptrdict.h
index 181492bd9..181492bd9 100644
--- a/src/tools/ntqptrdict.h
+++ b/src/tools/tqptrdict.h
diff --git a/src/tools/ntqptrlist.h b/src/tools/tqptrlist.h
index 579c1b226..579c1b226 100644
--- a/src/tools/ntqptrlist.h
+++ b/src/tools/tqptrlist.h
diff --git a/src/tools/ntqptrqueue.h b/src/tools/tqptrqueue.h
index c905b4fd6..c905b4fd6 100644
--- a/src/tools/ntqptrqueue.h
+++ b/src/tools/tqptrqueue.h
diff --git a/src/tools/ntqptrstack.h b/src/tools/tqptrstack.h
index 6f404f1b9..6f404f1b9 100644
--- a/src/tools/ntqptrstack.h
+++ b/src/tools/tqptrstack.h
diff --git a/src/tools/ntqptrvector.h b/src/tools/tqptrvector.h
index b2e641e7a..b2e641e7a 100644
--- a/src/tools/ntqptrvector.h
+++ b/src/tools/tqptrvector.h
diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h
index 85dce12b5..441f4b828 100644
--- a/src/widgets/ntqdockarea.h
+++ b/src/widgets/ntqdockarea.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqwidget.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqdockwindow.h"
 #include "ntqlayout.h"
 #include "tqvaluelist.h"
diff --git a/src/widgets/ntqmainwindow.h b/src/widgets/ntqmainwindow.h
index 647c23206..73265436a 100644
--- a/src/widgets/ntqmainwindow.h
+++ b/src/widgets/ntqmainwindow.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqwidget.h"
 #include "ntqtoolbar.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqtextstream.h"
 #endif // QT_H
 
diff --git a/src/widgets/ntqmenudata.h b/src/widgets/ntqmenudata.h
index 0f7e08afc..063392333 100644
--- a/src/widgets/ntqmenudata.h
+++ b/src/widgets/ntqmenudata.h
@@ -132,7 +132,7 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 typedef TQPtrList<TQMenuItem>	 TQMenuItemList;
 typedef TQPtrListIterator<TQMenuItem> TQMenuItemListIt;
 
diff --git a/src/widgets/ntqtabbar.h b/src/widgets/ntqtabbar.h
index c7010ed53..b9abccde0 100644
--- a/src/widgets/ntqtabbar.h
+++ b/src/widgets/ntqtabbar.h
@@ -41,7 +41,7 @@
 
 #ifndef QT_H
 #include "tqwidget.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #endif // QT_H
 
 #ifndef TQT_NO_TABBAR
diff --git a/src/widgets/ntqtextbrowser.h b/src/widgets/ntqtextbrowser.h
index 32806a539..c9ac4ae9e 100644
--- a/src/widgets/ntqtextbrowser.h
+++ b/src/widgets/ntqtextbrowser.h
@@ -42,7 +42,7 @@
 #define TQTEXTBROWSER_H
 
 #ifndef QT_H
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqpixmap.h"
 #include "ntqcolor.h"
 #include "ntqtextedit.h"
diff --git a/src/widgets/ntqtextedit.h b/src/widgets/ntqtextedit.h
index f14e06ff8..40906dbfc 100644
--- a/src/widgets/ntqtextedit.h
+++ b/src/widgets/ntqtextedit.h
@@ -44,9 +44,9 @@
 #ifndef QT_H
 #include "ntqscrollview.h"
 #include "ntqstylesheet.h"
-#include "ntqptrvector.h"
+#include "tqptrvector.h"
 #include "tqvaluelist.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #endif // QT_H
 
 #ifndef TQT_NO_TEXTEDIT
diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp
index cbeb093c3..49f1108c8 100644
--- a/src/widgets/qaction.cpp
+++ b/src/widgets/qaction.cpp
@@ -41,7 +41,7 @@
 #ifndef TQT_NO_ACTION
 
 #include "ntqtoolbar.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqpopupmenu.h"
 #include "ntqaccel.h"
 #include "ntqtoolbutton.h"
diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/qbuttongroup.cpp
index 15495edff..c1a708b80 100644
--- a/src/widgets/qbuttongroup.cpp
+++ b/src/widgets/qbuttongroup.cpp
@@ -41,7 +41,7 @@
 #include "ntqbuttongroup.h"
 #ifndef TQT_NO_BUTTONGROUP
 #include "ntqbutton.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqapplication.h"
 #include "ntqradiobutton.h"
 
diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp
index 1f982a1de..702de25a2 100644
--- a/src/widgets/qdockarea.cpp
+++ b/src/widgets/qdockarea.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_MAINWINDOW
 #include "ntqsplitter.h"
 #include "ntqlayout.h"
-#include "ntqptrvector.h"
+#include "tqptrvector.h"
 #include "ntqapplication.h"
 #include "ntqpainter.h"
 #include "tqwidgetlist.h"
diff --git a/src/widgets/qheader.cpp b/src/widgets/qheader.cpp
index f764b653f..d8d2a88b0 100644
--- a/src/widgets/qheader.cpp
+++ b/src/widgets/qheader.cpp
@@ -44,7 +44,7 @@
 #include "ntqdrawutil.h"
 #include "ntqpixmap.h"
 #include "ntqbitarray.h"
-#include "ntqptrvector.h"
+#include "tqptrvector.h"
 #include "ntqapplication.h"
 #include "ntqstyle.h"
 
diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp
index 154702ea7..82ee76060 100644
--- a/src/widgets/qiconview.cpp
+++ b/src/widgets/qiconview.cpp
@@ -61,12 +61,12 @@
 #include "ntqapplication.h"
 #include "ntqtextedit.h"
 #include "ntqmemarray.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqvbox.h"
 #include "ntqtooltip.h"
 #include "ntqbitmap.h"
 #include "ntqpixmapcache.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include "ntqstringlist.h"
 #include "ntqcleanuphandler.h"
 #include "private/qrichtext_p.h"
diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp
index 3669b3e25..e4b4f8066 100644
--- a/src/widgets/qlistbox.cpp
+++ b/src/widgets/qlistbox.cpp
@@ -52,7 +52,7 @@
 #include "ntqstrlist.h"
 #include "ntqpixmap.h"
 #include "ntqapplication.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include "ntqtimer.h"
 #include "ntqstringlist.h"
 #include "ntqstyle.h"
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index 599c99439..91a62c7de 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -44,14 +44,14 @@
 #include "ntqheader.h"
 #include "ntqpainter.h"
 #include "ntqcursor.h"
-#include "ntqptrstack.h"
-#include "ntqptrlist.h"
+#include "tqptrstack.h"
+#include "tqptrlist.h"
 #include "ntqstrlist.h"
 #include "ntqapplication.h"
 #include "ntqbitmap.h"
 #include "ntqdatetime.h"
-#include "ntqptrdict.h"
-#include "ntqptrvector.h"
+#include "tqptrdict.h"
+#include "tqptrvector.h"
 #include "ntqiconset.h"
 #include "ntqcleanuphandler.h"
 #include "ntqpixmapcache.h"
diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp
index 3510c8290..da20228b6 100644
--- a/src/widgets/qmainwindow.cpp
+++ b/src/widgets/qmainwindow.cpp
@@ -46,7 +46,7 @@
 #include "tqobjectlist.h"
 #include "ntqintdict.h"
 #include "ntqapplication.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "tqmap.h"
 #include "ntqcursor.h"
 #include "ntqpainter.h"
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index 8b9981ffa..a9ce4f876 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -47,7 +47,7 @@
 #include "ntqcursor.h"
 #include "ntqfocusdata.h"
 #include "ntqscrollview.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include "ntqapplication.h"
 #include "ntqtimer.h"
 #include "ntqstyle.h"
diff --git a/src/widgets/qsplitter.cpp b/src/widgets/qsplitter.cpp
index 33e5250bf..3e261f286 100644
--- a/src/widgets/qsplitter.cpp
+++ b/src/widgets/qsplitter.cpp
@@ -49,7 +49,7 @@
 #include "ntqmemarray.h"
 #include "tqobjectlist.h"
 #include "ntqpainter.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqstyle.h"
 
 const uint Default = QT_QSPLITTER_DEFAULT;
diff --git a/src/widgets/qstatusbar.cpp b/src/widgets/qstatusbar.cpp
index f5830d4b8..b0f0b1ea8 100644
--- a/src/widgets/qstatusbar.cpp
+++ b/src/widgets/qstatusbar.cpp
@@ -41,7 +41,7 @@
 #include "ntqstatusbar.h"
 #ifndef TQT_NO_STATUSBAR
 
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqlayout.h"
 #include "ntqpainter.h"
 #include "ntqtimer.h"
diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp
index fcb39a7f7..0fb328bf9 100644
--- a/src/widgets/qtextedit.cpp
+++ b/src/widgets/qtextedit.cpp
@@ -71,7 +71,7 @@
 #include "ntqcursor.h"
 #include "ntqregexp.h"
 #include "ntqpopupmenu.h"
-#include "ntqptrstack.h"
+#include "tqptrstack.h"
 #include "ntqmetaobject.h"
 #include "ntqtextbrowser.h"
 #include <private/qucom_p.h>
diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp
index d576d203f..a9f9624f5 100644
--- a/src/widgets/qtooltip.cpp
+++ b/src/widgets/qtooltip.cpp
@@ -39,7 +39,7 @@
 #include "ntqtooltip.h"
 #ifndef TQT_NO_TOOLTIP
 #include "ntqlabel.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include "ntqapplication.h"
 #include "ntqguardedptr.h"
 #include "ntqtimer.h"
diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp
index 086c3f0cc..41cb9fd82 100644
--- a/src/widgets/qwhatsthis.cpp
+++ b/src/widgets/qwhatsthis.cpp
@@ -43,7 +43,7 @@
 #include "ntqpixmap.h"
 #include "ntqpainter.h"
 #include "ntqtimer.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #include "ntqtoolbutton.h"
 #include "ntqshared.h"
 #include "ntqcursor.h"
diff --git a/src/widgets/tqwidgetstack.h b/src/widgets/tqwidgetstack.h
index 4967804c8..774ccb45c 100644
--- a/src/widgets/tqwidgetstack.h
+++ b/src/widgets/tqwidgetstack.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqframe.h"
 #include "ntqintdict.h"
-#include "ntqptrdict.h"
+#include "tqptrdict.h"
 #endif // QT_H
 
 #ifndef TQT_NO_WIDGETSTACK
diff --git a/src/xml/tqdom.cpp b/src/xml/tqdom.cpp
index 1abd76bc6..4feaf47a6 100644
--- a/src/xml/tqdom.cpp
+++ b/src/xml/tqdom.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_DOM
 
 #include "tqxml.h"
-#include "ntqptrlist.h"
+#include "tqptrlist.h"
 #include "ntqdict.h"
 #include "ntqtextstream.h"
 #include "ntqtextcodec.h"
diff --git a/src/xml/tqxml.cpp b/src/xml/tqxml.cpp
index a0d3f7f18..4a2b8615d 100644
--- a/src/xml/tqxml.cpp
+++ b/src/xml/tqxml.cpp
@@ -42,7 +42,7 @@
 #include "ntqtextcodec.h"
 #include "ntqbuffer.h"
 #include "ntqregexp.h"
-#include "ntqptrstack.h"
+#include "tqptrstack.h"
 #include "tqmap.h"
 #include "tqvaluestack.h"