Rename IO and network class nt* related files to equivalent tq*

Signed-off-by: Michele Calgaro <[email protected]>

67 files changed, 178 insertions, 178 deletions

diff --git a/src/kernel/ntqasyncio.h b/src/kernel/ntqasyncio.h
index b2c88ce4d..6c1687e9d 100644
--- a/src/kernel/ntqasyncio.h
+++ b/src/kernel/ntqasyncio.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqsignal.h"
+#include "tqsignal.h"
 #include "tqtimer.h"
 #endif // QT_H
 
diff --git a/src/kernel/ntqeventloop.h b/src/kernel/ntqeventloop.h
index 1c66e5950..75741a597 100644
--- a/src/kernel/ntqeventloop.h
+++ b/src/kernel/ntqeventloop.h
@@ -41,7 +41,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqsocketnotifier.h"
+#include "tqsocketnotifier.h"
 #endif // QT_H
 
 #ifdef Q_QDOC
diff --git a/src/kernel/ntqpicture.h b/src/kernel/ntqpicture.h
index e6b5bc912..3ef2867e9 100644
--- a/src/kernel/ntqpicture.h
+++ b/src/kernel/ntqpicture.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqpaintdevice.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #endif // QT_H
 
 #ifndef TQT_NO_PICTURE
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index e9b0343a4..5c9058a14 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -27,12 +27,12 @@
 #include "tqcstring.h"
 #include "tqstring.h"
 #include "tqptrlist.h"
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "ntqkeysequence.h"
 #include "ntqwindowdefs.h"
 #include "ntqgdict.h"
 #include "ntqfont.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "tqpair.h"
 #include "ntqpoint.h"
 #include <stdio.h>
@@ -55,7 +55,7 @@
 #include "ntqfontmetrics.h"
 #include "tqdict.h"
 #include "ntqevent.h"
-#include "ntqhostaddress.h"
+#include "tqhostaddress.h"
 #include "tqstringlist.h"
 #include "ntqcolor.h"
 #include <tqdom.h>
@@ -73,9 +73,9 @@
 #include <tqtoolbutton.h>
 #include "tqstyle.h"
 #include "ntqframe.h"
-#include "ntqfile.h"
-#include "ntqfileinfo.h"
-#include "ntqurlinfo.h"
+#include "tqfile.h"
+#include "tqfileinfo.h"
+#include "tqurlinfo.h"
 #include "tqwidgetlist.h"
 #include <ntqcombobox.h>
 #include "ntqgroupbox.h"
@@ -83,7 +83,7 @@
 #include <tqdataview.h>
 #include "ntqdockwindow.h"
 #include "ntqcommonstyle.h"
-#include "ntqnetworkprotocol.h"
+#include "tqnetworkprotocol.h"
 #include <tqeuckrcodec.h>
 #include <tqgb18030codec.h>
 #include "ntqgcache.h"
@@ -100,11 +100,11 @@
 #include "ntqhbox.h"
 #include <ntqhbuttongroup.h>
 #include <ntqhgroupbox.h>
-#include "ntqsocketnotifier.h"
+#include "tqsocketnotifier.h"
 #include <ntqeventloop.h>
-#include <ntqhttp.h>
+#include <tqhttp.h>
 #include <tqaction.h>
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include "tqimage.h"
 #include <tqimageformatplugin.h>
 #include "ntqlineedit.h"
@@ -123,12 +123,12 @@
 #include <ntqinputdialog.h>
 #include "ntqscrollbar.h"
 #include "ntqscrollview.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 #include "ntqwindowsstyle.h"
 #include "ntqconnection.h"
 #include "tqbitmap.h"
 #include "ntqvariant.h"
-#include "ntqsignal.h"
+#include "tqsignal.h"
 #include <ntqmessagebox.h>
 #include "ntqmetaobject.h"
 #include "ntqheader.h"
@@ -137,8 +137,8 @@
 #include <ntqmovie.h>
 #include "tqptrvector.h"
 #include "tqmutex.h"
-#include <ntqnetwork.h>
-#include <ntqftp.h>
+#include <tqnetwork.h>
+#include <tqftp.h>
 #include "ntqguardedptr.h"
 #include <tqobjectcleanuphandler.h>
 #include "tqsqlfield.h"
@@ -161,7 +161,7 @@
 #include "tqpopupmenu.h"
 #include <ntqprintdialog.h>
 #include <ntqprinter.h>
-#include <ntqprocess.h>
+#include <tqprocess.h>
 #include "ntqprogressbar.h"
 #include <tqasciicache.h>
 #include "tqptrdict.h"
@@ -174,29 +174,29 @@
 #include <ntqdial.h>
 #include <ntqdockarea.h>
 #include "tqregexp.h"
-#include <ntqclipboard.h>
+#include <tqclipboard.h>
 #include <tqhebrewcodec.h>
 #include <ntqlistbox.h>
 #include <ntqgridview.h>
 #include "tqsemaphore.h"
 #include <ntqprogressdialog.h>
-#include "ntqsocketdevice.h"
+#include "tqsocketdevice.h"
 #include <tqsessionmanager.h>
-#include <ntqsettings.h>
+#include <tqsettings.h>
 #include <ntqsgistyle.h>
 #include <ntqfontdialog.h>
 #include "tqtimer.h"
-#include <ntqsignalmapper.h>
-#include <ntqsignalslotimp.h>
+#include <tqsignalmapper.h>
+#include <tqsignalslotimp.h>
 #include <ntqsimplerichtext.h>
 #include "ntqwmatrix.h"
 #include <tqsizegrip.h>
 #include <ntqabstractlayout.h>
 #include <tqsjiscodec.h>
 #include <ntqslider.h>
-#include <ntqsocket.h>
-#include <ntqserversocket.h>
-#include <ntqdns.h>
+#include <tqsocket.h>
+#include <tqserversocket.h>
+#include <tqdns.h>
 #include <ntqsound.h>
 #include <ntqspinbox.h>
 #include <ntqsplashscreen.h>
@@ -244,9 +244,9 @@
 #include <tqtooltip.h>
 #include "ntqdesktopwidget.h"
 #include <tqtsciicodec.h>
-#include "ntqurl.h"
-#include "ntqurloperator.h"
-#include <ntqfiledialog.h>
+#include "tqurl.h"
+#include "tqurloperator.h"
+#include <tqfiledialog.h>
 #include <tqutfcodec.h>
 #include <ntquuid.h>
 #include <ntqvalidator.h>
@@ -269,7 +269,7 @@
 #include <ntqwizard.h>
 #include <ntqpainter.h>
 #include <tqworkspace.h>
-#include <ntqlocalfs.h>
+#include <tqlocalfs.h>
 #include <tqxml.h>
 
 #if defined( QT_MOC_CPP ) || defined( QT_H_CPP ) || defined( Q_OS_MACX )
@@ -297,8 +297,8 @@
 #include "private/qucom_p.h"
 #include "private/qucomextra_p.h"
 #include "private/qpluginmanager_p.h"
-#include "private/qdir_p.h"
-#include "private/qsettings_p.h"
+#include "private/tqdir_p.h"
+#include "private/tqsettings_p.h"
 #include "private/tqsqlextension_p.h"
 #include "private/qdialogbuttons_p.h"
 #include "private/tqwidgetinterface_p.h"
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index 00d9c3f05..b11c6b427 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_ACCEL
 
-#include "ntqsignal.h"
+#include "tqsignal.h"
 #include "ntqapplication.h"
 #include "tqwidget.h"
 #include "tqptrlist.h"
@@ -50,7 +50,7 @@
 #include "ntqguardedptr.h"
 #include "tqstatusbar.h"
 #include "ntqdockwindow.h"
-#include "ntqsignalslotimp.h"
+#include "tqsignalslotimp.h"
 /*!
     \class TQAccel ntqaccel.h
     \brief The TQAccel class handles keyboard accelerator and shortcut keys.
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index ee1395619..8f456790c 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -52,14 +52,14 @@
 #include "tqtextcodec.h"
 #include "tqsessionmanager.h"
 #include "tqdragobject.h"
-#include "ntqclipboard.h"
+#include "tqclipboard.h"
 #include "ntqcursor.h"
 #include "tqstyle.h"
 #include "tqstylefactory.h"
-#include "ntqfile.h"
+#include "tqfile.h"
 #include "ntqmessagebox.h"
-#include "ntqdir.h"
-#include "ntqfileinfo.h"
+#include "tqdir.h"
+#include "tqfileinfo.h"
 #ifdef TQ_WS_WIN
 #include "qinputcontext_p.h"
 #endif
diff --git a/src/kernel/qapplication_p.h b/src/kernel/qapplication_p.h
index 7f6fbf9f9..6cb61e4ce 100644
--- a/src/kernel/qapplication_p.h
+++ b/src/kernel/qapplication_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qapplication_*.cpp, tqwidget*.cpp, qcolor_x11.cpp, qfiledialog.cpp
+// of qapplication_*.cpp, tqwidget*.cpp, qcolor_x11.cpp, tqfiledialog.cpp
 // and many other.  This header file may change from version to version
 // without notice, or even be removed.
 //
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 47524c6a5..444271514 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -75,18 +75,18 @@
 #include "ntqpixmapcache.h"
 #include "tqdatetime.h"
 #include "tqtextcodec.h"
-#include "ntqdatastream.h"
-#include "ntqbuffer.h"
-#include "ntqsocketnotifier.h"
+#include "tqdatastream.h"
+#include "tqbuffer.h"
+#include "tqsocketnotifier.h"
 #include "tqsessionmanager.h"
 #include "tqvaluelist.h"
 #include "tqdict.h"
 #include "ntqguardedptr.h"
-#include "ntqclipboard.h"
+#include "tqclipboard.h"
 #include "ntqwhatsthis.h" // ######## dependency
-#include "ntqsettings.h"
+#include "tqsettings.h"
 #include "tqstylefactory.h"
-#include "ntqfileinfo.h"
+#include "tqfileinfo.h"
 
 // Input method stuff - UNFINISHED
 #ifndef TQT_NO_IM
@@ -99,7 +99,7 @@
 #endif
 
 #if defined(QT_DEBUG) && defined(Q_OS_LINUX)
-# include "ntqfile.h"
+# include "tqfile.h"
 #endif
 
 #include "qt_x11_p.h"
@@ -435,8 +435,8 @@ TQ_EXPORT TQTextCodec * qt_input_mapper = 0;
 
 TQ_EXPORT Time	tqt_x_time = CurrentTime;
 TQ_EXPORT Time	tqt_x_user_time = CurrentTime;
-extern bool     qt_check_clipboard_sentinel(); //def in qclipboard_x11.cpp
-extern bool	qt_check_selection_sentinel(); //def in qclipboard_x11.cpp
+extern bool     qt_check_clipboard_sentinel(); //def in tqclipboard_x11.cpp
+extern bool	qt_check_selection_sentinel(); //def in tqclipboard_x11.cpp
 
 static void	qt_save_rootinfo();
 bool	tqt_try_modal( TQWidget *, XEvent * );
diff --git a/src/kernel/qasyncio.cpp b/src/kernel/qasyncio.cpp
index c4811e758..4d3acff73 100644
--- a/src/kernel/qasyncio.cpp
+++ b/src/kernel/qasyncio.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqasyncio.h"
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include <stdlib.h>
 
 #ifndef TQT_NO_ASYNC_IO
diff --git a/src/kernel/qcolor.cpp b/src/kernel/qcolor.cpp
index 0e74dc462..8d7a72935 100644
--- a/src/kernel/qcolor.cpp
+++ b/src/kernel/qcolor.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqcolor.h"
 #include "ntqnamespace.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 #include <stdio.h>
 
diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp
index 7d1b0a160..08100ccb7 100644
--- a/src/kernel/qcursor.cpp
+++ b/src/kernel/qcursor.cpp
@@ -44,7 +44,7 @@
 
 #include "tqbitmap.h"
 #include "tqimage.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 
 /*!
diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp
index f7a073612..dffa45ce6 100644
--- a/src/kernel/qcursor_x11.cpp
+++ b/src/kernel/qcursor_x11.cpp
@@ -42,7 +42,7 @@
 #include "tqbitmap.h"
 #include "tqimage.h"
 #include "ntqapplication.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqnamespace.h"
 #include "qt_x11_p.h"
 #include <X11/cursorfont.h>
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index 99f1dba77..8910d7a11 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -47,7 +47,7 @@
 #include "ntqpainter.h"
 #include "tqdict.h"
 #include "tqcache.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqapplication.h"
 #include "ntqcleanuphandler.h"
 #include "tqstringlist.h"
diff --git a/src/kernel/qinternal_p.h b/src/kernel/qinternal_p.h
index 837c81421..1ced79556 100644
--- a/src/kernel/qinternal_p.h
+++ b/src/kernel/qinternal_p.h
@@ -57,7 +57,7 @@
 #include "ntqrect.h"
 #include "tqptrlist.h"
 #include "tqcstring.h"
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #endif // QT_H
 
 class TQWidget;
diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp
index c30853d02..56b22fbbf 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/qjpegio.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_IMAGEIO_JPEG
 
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "ntqjpegio.h"
 
 #include <stdio.h>      // jpeglib needs this to be pre-included
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index 5c46cbd74..63e08c830 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/qmngio.cpp
@@ -44,7 +44,7 @@
 
 #include "tqimage.h"
 #include "ntqasyncimageio.h"
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 #include "ntqmngio.h"
 
 // Define XMD_H prohibits the included headers of libmng.h to typedef INT32.
diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/qmotifdnd_x11.cpp
index 548310dab..8bd2d8b8f 100644
--- a/src/kernel/qmotifdnd_x11.cpp
+++ b/src/kernel/qmotifdnd_x11.cpp
@@ -95,7 +95,7 @@ static ushort num_src_targets ;
 
 extern bool qt_motifdnd_active;
 
-// this stuff is copied from qclipboard_x11.cpp
+// this stuff is copied from tqclipboard_x11.cpp
 
 extern bool qt_xclb_wait_for_event( Display *dpy, Window win, int type,
 				    XEvent *event, int timeout );
@@ -704,7 +704,7 @@ const char *qt_motifdnd_format( int n )
 
     Atom target = src_targets[n];
 
-    // duplicated from qclipboard_x11.cpp - not the best solution
+    // duplicated from tqclipboard_x11.cpp - not the best solution
     static Atom xa_utf8_string = *qt_xdnd_str_to_atom( "UTF8_STRING" );
     static Atom xa_text = *qt_xdnd_str_to_atom( "TEXT" );
     static Atom xa_compound_text = *qt_xdnd_str_to_atom( "COMPOUND_TEXT" );
diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp
index ea6f99942..a26f03d7f 100644
--- a/src/kernel/qmovie.cpp
+++ b/src/kernel/qmovie.cpp
@@ -45,8 +45,8 @@
 #include "tqptrlist.h"
 #include "tqbitmap.h"
 #include "ntqmovie.h"
-#include "ntqfile.h"
-#include "ntqbuffer.h"
+#include "tqfile.h"
+#include "tqbuffer.h"
 #include "tqobject.h"
 #include "ntqpixmapcache.h"
 
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index 731708b77..a74ca938a 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -43,7 +43,7 @@
 #include "tqbitmap.h"
 #include "tqptrstack.h"
 #include "tqptrdict.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "tqwidget.h"
 #include "tqimage.h"
 #include "ntqpaintdevicemetrics.h"
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index f8de8c9a5..bfb62de41 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -436,7 +436,7 @@ static void init_gc_cache()
 // #define GC_CACHE_STAT
 #if defined(GC_CACHE_STAT)
 #include "tqtextstream.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 
 static int g_numhits    = 0;
 static int g_numcreates = 0;
diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp
index b1ed971f9..43009fe7b 100644
--- a/src/kernel/qpalette.cpp
+++ b/src/kernel/qpalette.cpp
@@ -41,7 +41,7 @@
 #include "ntqpalette.h"
 
 #ifndef TQT_NO_PALETTE
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqcleanuphandler.h"
 
 /*****************************************************************************
diff --git a/src/kernel/qpicture.cpp b/src/kernel/qpicture.cpp
index 912fbfb5b..45e706cb1 100644
--- a/src/kernel/qpicture.cpp
+++ b/src/kernel/qpicture.cpp
@@ -45,8 +45,8 @@
 #include "ntqpainter.h"
 #include "ntqpixmap.h"
 #include "tqimage.h"
-#include "ntqfile.h"
-#include "ntqdatastream.h"
+#include "tqfile.h"
+#include "tqdatastream.h"
 #include "ntqpaintdevicemetrics.h"
 
 #ifndef TQT_NO_SVG
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index 33fca8ffd..c39a86e67 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -44,14 +44,14 @@
 #include "tqimage.h"
 #include "tqwidget.h"
 #include "ntqpainter.h"
-#include "ntqdatastream.h"
-#include "ntqbuffer.h"
+#include "tqdatastream.h"
+#include "tqbuffer.h"
 #include "tqobjectlist.h"
 #include "ntqapplication.h"
 #include <private/qinternal_p.h>
 #include "tqmime.h"
 #include "tqdragobject.h"
-#include "ntqfile.h"
+#include "tqfile.h"
 
 /*!
     \class TQPixmap ntqpixmap.h
diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp
index 134aacd1c..c2db400ac 100644
--- a/src/kernel/qpngio.cpp
+++ b/src/kernel/qpngio.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_IMAGEIO_PNG
 
 #include "ntqasyncimageio.h"
-#include "ntqiodevice.h"
+#include "tqiodevice.h"
 
 #include <png.h>
 #if PNG_LIBPNG_VER>=10500
diff --git a/src/kernel/qpoint.cpp b/src/kernel/qpoint.cpp
index d3c409ef3..e3f620f9e 100644
--- a/src/kernel/qpoint.cpp
+++ b/src/kernel/qpoint.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqpoint.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 
 /*!
diff --git a/src/kernel/qpointarray.cpp b/src/kernel/qpointarray.cpp
index 4a4031ff6..ccba1122e 100644
--- a/src/kernel/qpointarray.cpp
+++ b/src/kernel/qpointarray.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqpointarray.h"
 #include "ntqrect.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqwmatrix.h"
 #include <stdarg.h>
 
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index b70e809df..8bd04b845 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -64,11 +64,11 @@
 #include "tqstring.h"
 #include "tqdict.h"
 #include "tqmemarray.h"
-#include "ntqfile.h"
-#include "ntqbuffer.h"
+#include "tqfile.h"
+#include "tqbuffer.h"
 #include "tqintdict.h"
 #include "tqtextcodec.h"
-#include "ntqsettings.h"
+#include "tqsettings.h"
 #include "tqmap.h"
 #include "ntqfontdatabase.h"
 #include "tqregexp.h"
@@ -5155,7 +5155,7 @@ TQPSPrinterPrivate::TQPSPrinterPrivate( TQPrinter *prt, int filedes )
     scriptUsed = -1;
 
 #ifdef TQ_WS_X11
-    // append qsettings fontpath
+    // append tqsettings fontpath
     TQSettings settings;
     embedFonts = settings.readBoolEntry( "/qt/embedFonts", TRUE );
 
@@ -5207,7 +5207,7 @@ TQPSPrinterPrivate::TQPSPrinterPrivate( TQPrinter *prt, int filedes )
     }
     XFreeFontPath(font_path);
 
-    // append qsettings fontpath
+    // append tqsettings fontpath
     TQStringList fp = settings.readListEntry( "/qt/fontPath", ':' );
     if ( !fp.isEmpty() )
         fontpath += fp;
diff --git a/src/kernel/qrect.cpp b/src/kernel/qrect.cpp
index f3bc3ff65..db941c3b1 100644
--- a/src/kernel/qrect.cpp
+++ b/src/kernel/qrect.cpp
@@ -40,7 +40,7 @@
 
 #define	 TQRECT_C
 #include "ntqrect.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 /*!
     \class TQRect
diff --git a/src/kernel/qregion.cpp b/src/kernel/qregion.cpp
index 105f96430..cc8fae37d 100644
--- a/src/kernel/qregion.cpp
+++ b/src/kernel/qregion.cpp
@@ -40,8 +40,8 @@
 
 #include "ntqregion.h"
 #include "ntqpointarray.h"
-#include "ntqbuffer.h"
-#include "ntqdatastream.h"
+#include "tqbuffer.h"
+#include "tqdatastream.h"
 
 // BEING REVISED: paul
 /*!
diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp
index 55a7d8380..c10856a0d 100644
--- a/src/kernel/qregion_x11.cpp
+++ b/src/kernel/qregion_x11.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqregion.h"
 #include "ntqpointarray.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include "tqimage.h"
 #include "tqbitmap.h"
 #include "qt_x11_p.h"
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index 0228a58fe..eb31aa554 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -46,10 +46,10 @@
 #include "tqstringlist.h"
 #include "ntqfont.h"
 #include "tqtextstream.h"
-#include "ntqfile.h"
+#include "tqfile.h"
 #include "ntqapplication.h"
 #include "tqmap.h"
-#include "ntqfileinfo.h"
+#include "tqfileinfo.h"
 #include "tqstylesheet.h"
 #include "tqmime.h"
 #include "tqimage.h"
diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp
index 11d34e476..ea0d8f212 100644
--- a/src/kernel/qsound_x11.cpp
+++ b/src/kernel/qsound_x11.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_SOUND
 
 #include "tqptrdict.h"
-#include "ntqsocketnotifier.h"
+#include "tqsocketnotifier.h"
 #include "ntqapplication.h"
 
 
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index eca64009e..5cbddd2db 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -11,7 +11,7 @@ kernel {
 		  $$KERNEL_H/ntqasyncio.h \
 		  $$KERNEL_H/tqbitmap.h \
 		  $$KERNEL_H/ntqbrush.h \
-		  $$KERNEL_H/ntqclipboard.h \
+		  $$KERNEL_H/tqclipboard.h \
 		  $$KERNEL_H/ntqcolor.h \
 		  $$KERNEL_P/qcolor_p.h \
 		  $$KERNEL_H/ntqconnection.h \
@@ -44,7 +44,7 @@ kernel {
 		  $$KERNEL_H/tqmime.h \
 		  $$KERNEL_H/ntqmovie.h \
 		  $$KERNEL_H/ntqnamespace.h \
-		  $$KERNEL_H/ntqnetworkprotocol.h \
+		  $$KERNEL_H/tqnetworkprotocol.h \
 		  $$KERNEL_H/tqobject.h \
  		  $$KERNEL_H/tqobjectcleanuphandler.h \
 		  $$KERNEL_H/tqobjectdefs.h \
@@ -63,26 +63,26 @@ kernel {
 		  $$KERNEL_H/ntqpoint.h \
 		  $$KERNEL_H/ntqpolygonscanner.h \
 		  $$KERNEL_H/ntqprinter.h \
-		  $$KERNEL_H/ntqprocess.h \
+		  $$KERNEL_H/tqprocess.h \
 		  $$KERNEL_H/ntqrect.h \
 		  $$KERNEL_H/ntqregion.h \
 		  $$KERNEL_H/tqsessionmanager.h \
-		  $$KERNEL_H/ntqsignal.h \
-		  $$KERNEL_H/ntqsignalmapper.h \
-		  $$KERNEL_H/ntqsignalslotimp.h \
+		  $$KERNEL_H/tqsignal.h \
+		  $$KERNEL_H/tqsignalmapper.h \
+		  $$KERNEL_H/tqsignalslotimp.h \
 		  $$KERNEL_H/tqsize.h \
 		  $$KERNEL_H/tqsizegrip.h \
 		  $$KERNEL_H/tqsizepolicy.h \
-		  $$KERNEL_H/ntqsocketnotifier.h \
+		  $$KERNEL_H/tqsocketnotifier.h \
 		  $$KERNEL_H/ntqsound.h \
 		  $$KERNEL_H/tqstyle.h \
 		  $$KERNEL_H/tqstylesheet.h \
 		  $$KERNEL_H/tqthread.h \
 		  $$KERNEL_H/tqtimer.h \
-		  $$KERNEL_H/ntqurl.h \
-		  $$KERNEL_H/ntqlocalfs.h \
-		  $$KERNEL_H/ntqurloperator.h \
-		  $$KERNEL_H/ntqurlinfo.h \
+		  $$KERNEL_H/tqurl.h \
+		  $$KERNEL_H/tqlocalfs.h \
+		  $$KERNEL_H/tqurloperator.h \
+		  $$KERNEL_H/tqurlinfo.h \
 		  $$KERNEL_H/tqwidget.h \
 		  $$KERNEL_H/tqwidgetintdict.h \
 		  $$KERNEL_H/tqwidgetlist.h \
@@ -111,7 +111,7 @@ kernel {
 		  } 
 		  
 	win32:SOURCES += $$KERNEL_CPP/qapplication_win.cpp \
-		  $$KERNEL_CPP/qclipboard_win.cpp \
+		  $$KERNEL_CPP/tqclipboard_win.cpp \
 		  $$KERNEL_CPP/qcolor_win.cpp \
 		  $$KERNEL_CPP/qcursor_win.cpp \
 		  $$KERNEL_CPP/qdesktopwidget_win.cpp \
@@ -122,7 +122,7 @@ kernel {
 		  $$KERNEL_CPP/tqmime_win.cpp \
 		  $$KERNEL_CPP/qpixmap_win.cpp \
 		  $$KERNEL_CPP/qprinter_win.cpp \
-		  $$KERNEL_CPP/qprocess_win.cpp \
+		  $$KERNEL_CPP/tqprocess_win.cpp \
 		  $$KERNEL_CPP/qpaintdevice_win.cpp \
 		  $$KERNEL_CPP/qpainter_win.cpp \
 		  $$KERNEL_CPP/qregion_win.cpp \
@@ -134,7 +134,7 @@ kernel {
 
 	unix:x11 {
 	      SOURCES += $$KERNEL_CPP/qapplication_x11.cpp \
-		          $$KERNEL_CPP/qclipboard_x11.cpp \
+		          $$KERNEL_CPP/tqclipboard_x11.cpp \
 			  $$KERNEL_CPP/qcolor_x11.cpp \
 			  $$KERNEL_CPP/qcursor_x11.cpp \
 			  $$KERNEL_CPP/qdnd_x11.cpp \
@@ -164,7 +164,7 @@ kernel {
 	}
         !embedded:!x11:mac {
 	      SOURCES += $$KERNEL_CPP/qapplication_mac.cpp \
-		          $$KERNEL_CPP/qclipboard_mac.cpp \
+		          $$KERNEL_CPP/tqclipboard_mac.cpp \
 			  $$KERNEL_CPP/qcolor_mac.cpp \
 			  $$KERNEL_CPP/qcursor_mac.cpp \
 			  $$KERNEL_CPP/tqmime_mac.cpp \
@@ -190,7 +190,7 @@ kernel {
            }
 
         }
-	unix:SOURCES += $$KERNEL_CPP/qprocess_unix.cpp \
+	unix:SOURCES += $$KERNEL_CPP/tqprocess_unix.cpp \
 		        $$KERNEL_CPP/tqthread_unix.cpp
 
 	SOURCES += $$KERNEL_CPP/qabstractlayout.cpp \
@@ -200,7 +200,7 @@ kernel {
 		  $$KERNEL_CPP/qasyncimageio.cpp \
 		  $$KERNEL_CPP/qasyncio.cpp \
 		  $$KERNEL_CPP/tqbitmap.cpp \
-		  $$KERNEL_CPP/qclipboard.cpp \
+		  $$KERNEL_CPP/tqclipboard.cpp \
 		  $$KERNEL_CPP/qcolor.cpp \
 		  $$KERNEL_CPP/qcolor_p.cpp \
 		  $$KERNEL_CPP/qconnection.cpp \
@@ -224,7 +224,7 @@ kernel {
 		  $$KERNEL_CPP/qmetaobject.cpp \
 		  $$KERNEL_CPP/tqmime.cpp \
 		  $$KERNEL_CPP/qmovie.cpp \
-		  $$KERNEL_CPP/qnetworkprotocol.cpp \
+		  $$KERNEL_CPP/tqnetworkprotocol.cpp \
 		  $$KERNEL_CPP/tqobject.cpp \
 		  $$KERNEL_CPP/tqobjectcleanuphandler.cpp \
 		  $$KERNEL_CPP/qpainter.cpp \
@@ -237,23 +237,23 @@ kernel {
 		  $$KERNEL_CPP/qpoint.cpp \
 		  $$KERNEL_CPP/qpolygonscanner.cpp \
 		  $$KERNEL_CPP/qprinter.cpp \
-		  $$KERNEL_CPP/qprocess.cpp \
+		  $$KERNEL_CPP/tqprocess.cpp \
 		  $$KERNEL_CPP/qrect.cpp \
 		  $$KERNEL_CPP/qregion.cpp \
-		  $$KERNEL_CPP/qsignal.cpp \
-		  $$KERNEL_CPP/qsignalmapper.cpp \
+		  $$KERNEL_CPP/tqsignal.cpp \
+		  $$KERNEL_CPP/tqsignalmapper.cpp \
 		  $$KERNEL_CPP/tqsize.cpp \
 		  $$KERNEL_CPP/tqsizegrip.cpp \
 		  $$KERNEL_CPP/tqstyle.cpp \
-		  $$KERNEL_CPP/qsocketnotifier.cpp \
+		  $$KERNEL_CPP/tqsocketnotifier.cpp \
 		  $$KERNEL_CPP/qsound.cpp \
 		  $$KERNEL_CPP/tqstylesheet.cpp \
 		  $$KERNEL_CPP/tqthread.cpp \
 		  $$KERNEL_CPP/tqtimer.cpp \
-		  $$KERNEL_CPP/qurl.cpp \
-		  $$KERNEL_CPP/qlocalfs.cpp \
-		  $$KERNEL_CPP/qurloperator.cpp \
-		  $$KERNEL_CPP/qurlinfo.cpp \
+		  $$KERNEL_CPP/tqurl.cpp \
+		  $$KERNEL_CPP/tqlocalfs.cpp \
+		  $$KERNEL_CPP/tqurloperator.cpp \
+		  $$KERNEL_CPP/tqurlinfo.cpp \
 		  $$KERNEL_CPP/tqwidget.cpp \
 		  $$KERNEL_CPP/qwmatrix.cpp \
 		  $$KERNEL_CPP/qvariant.cpp \
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp
index 42c741e8a..cda1735ae 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/qtranslator.cpp
@@ -56,14 +56,14 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 
 #ifndef TQT_NO_TRANSLATION
 
-#include "ntqfileinfo.h"
+#include "tqfileinfo.h"
 #include "tqwidgetlist.h"
 #include "tqintdict.h"
 #include "tqstring.h"
 #include "ntqapplication.h"
-#include "ntqfile.h"
-#include "ntqbuffer.h"
-#include "ntqdatastream.h"
+#include "tqfile.h"
+#include "tqbuffer.h"
+#include "tqdatastream.h"
 #include "tqmap.h"
 #include "ntqtl.h"
 
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index 1de08c389..19e8f85ac 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -54,7 +54,7 @@
 #include "ntqcolor.h"
 #include "ntqpalette.h"
 #include "tqiconset.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqregion.h"
 #include "ntqpointarray.h"
 #include "tqbitmap.h"
diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp
index dae4bc74b..6c881b208 100644
--- a/src/kernel/qwmatrix.cpp
+++ b/src/kernel/qwmatrix.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqwmatrix.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 #include "ntqregion.h"
 #if defined(TQ_WS_X11)
 double qsincos( double, bool calcCos );		// defined in qpainter_x11.cpp
diff --git a/src/kernel/qclipboard.cpp b/src/kernel/tqclipboard.cpp
index 416a5926f..37393b7c4 100644
--- a/src/kernel/qclipboard.cpp
+++ b/src/kernel/tqclipboard.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqclipboard.h"
+#include "tqclipboard.h"
 
 #ifndef TQT_NO_CLIPBOARD
 
@@ -48,7 +48,7 @@
 #include "ntqpixmap.h"
 
 /*!
-    \class TQClipboard ntqclipboard.h
+    \class TQClipboard tqclipboard.h
     \brief The TQClipboard class provides access to the window system clipboard.
 
     \ingroup io
diff --git a/src/kernel/ntqclipboard.h b/src/kernel/tqclipboard.h
index 0202f78de..0202f78de 100644
--- a/src/kernel/ntqclipboard.h
+++ b/src/kernel/tqclipboard.h
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/tqclipboard_x11.cpp
index 056b3de91..5c78b7ee5 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/tqclipboard_x11.cpp
@@ -60,7 +60,7 @@
 # undef open
 #endif
 
-#include "ntqclipboard.h"
+#include "tqclipboard.h"
 
 #ifndef TQT_NO_CLIPBOARD
 
@@ -69,7 +69,7 @@
 #include "tqbitmap.h"
 #include "tqdatetime.h"
 #include "tqdragobject.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include "tqtextcodec.h"
 #include "tqvaluelist.h"
 #include "tqmap.h"
diff --git a/src/kernel/tqdragobject.cpp b/src/kernel/tqdragobject.cpp
index 68678e7d6..3c8921a59 100644
--- a/src/kernel/tqdragobject.cpp
+++ b/src/kernel/tqdragobject.cpp
@@ -50,10 +50,10 @@
 #include "ntqapplication.h"
 #include "ntqpoint.h"
 #include "tqwidget.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include "ntqgif.h"
 #include "tqregexp.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 #include <ctype.h>
 
 // both a struct for storing stuff in and a wrapper to avoid polluting
@@ -578,7 +578,7 @@ TQWidget * TQDragObject::source()
 
     TQDragObject is the base class for all data that needs to be
     transferred between and within applications, both for drag and
-    drop and for the \link ntqclipboard.html clipboard\endlink.
+    drop and for the \link tqclipboard.html clipboard\endlink.
 
     See the \link dnd.html Drag-and-drop documentation\endlink for an
     overview of how to provide drag and drop in your application.
diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp
index 5f45e2fdc..e7afa87f1 100644
--- a/src/kernel/tqimage.cpp
+++ b/src/kernel/tqimage.cpp
@@ -40,10 +40,10 @@
 
 #include "tqimage.h"
 #include "tqregexp.h"
-#include "ntqfile.h"
-#include "ntqdatastream.h"
+#include "tqfile.h"
+#include "tqdatastream.h"
 #include "tqtextstream.h"
-#include "ntqbuffer.h"
+#include "tqbuffer.h"
 #include "tqptrlist.h"
 #include "ntqasyncimageio.h"
 #include "ntqpngio.h"
diff --git a/src/kernel/qlocalfs.cpp b/src/kernel/tqlocalfs.cpp
index 6932c4152..b6b525c8d 100644
--- a/src/kernel/qlocalfs.cpp
+++ b/src/kernel/tqlocalfs.cpp
@@ -38,22 +38,22 @@
 **
 **********************************************************************/
 
-#include "ntqlocalfs.h"
+#include "tqlocalfs.h"
 
 #ifndef TQT_NO_NETWORKPROTOCOL
 
-#include "ntqfileinfo.h"
-#include "ntqfile.h"
-#include "ntqurlinfo.h"
+#include "tqfileinfo.h"
+#include "tqfile.h"
+#include "tqurlinfo.h"
 #include "ntqapplication.h"
-#include "ntqurloperator.h"
+#include "tqurloperator.h"
 #include "ntqguardedptr.h"
 
 //#define TQLOCALFS_DEBUG
 
 
 /*!
-    \class TQLocalFs ntqlocalfs.h
+    \class TQLocalFs tqlocalfs.h
     \brief The TQLocalFs class is an implementation of a
     TQNetworkProtocol that works on the local file system.
 \if defined(commercial)
diff --git a/src/kernel/ntqlocalfs.h b/src/kernel/tqlocalfs.h
index 2ee4fad0d..010855c7b 100644
--- a/src/kernel/ntqlocalfs.h
+++ b/src/kernel/tqlocalfs.h
@@ -42,8 +42,8 @@
 #define TQLOCALFS_H
 
 #ifndef QT_H
-#include "ntqnetworkprotocol.h"
-#include "ntqdir.h"
+#include "tqnetworkprotocol.h"
+#include "tqdir.h"
 #endif // QT_H
 
 #ifndef TQT_NO_NETWORKPROTOCOL
diff --git a/src/kernel/tqmime.cpp b/src/kernel/tqmime.cpp
index 984d88be4..14e8f8306 100644
--- a/src/kernel/tqmime.cpp
+++ b/src/kernel/tqmime.cpp
@@ -42,12 +42,12 @@
 
 #include "tqmap.h"
 #include "tqstringlist.h"
-#include "ntqfileinfo.h"
-#include "ntqdir.h"
+#include "tqfileinfo.h"
+#include "tqdir.h"
 #include "tqdragobject.h"
 #include "ntqcleanuphandler.h"
 #include "ntqapplication.h" // ### for now
-#include "ntqclipboard.h" // ### for now
+#include "tqclipboard.h" // ### for now
 
 /*!
     \class TQMimeSource tqmime.h
diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/tqnetworkprotocol.cpp
index 718a7ac11..a595c2d0e 100644
--- a/src/kernel/qnetworkprotocol.cpp
+++ b/src/kernel/tqnetworkprotocol.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "ntqnetworkprotocol.h"
+#include "tqnetworkprotocol.h"
 
 #ifndef TQT_NO_NETWORKPROTOCOL
 
-#include "ntqlocalfs.h"
-#include "ntqurloperator.h"
+#include "tqlocalfs.h"
+#include "tqurloperator.h"
 #include "tqtimer.h"
 #include "tqmap.h"
 #include "tqptrqueue.h"
@@ -99,7 +99,7 @@ public:
 };
 
 /*!
-    \class TQNetworkProtocol ntqnetworkprotocol.h
+    \class TQNetworkProtocol tqnetworkprotocol.h
     \brief The TQNetworkProtocol class provides a common API for network protocols.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/kernel/ntqnetworkprotocol.h b/src/kernel/tqnetworkprotocol.h
index 55c7436da..df30cb5ca 100644
--- a/src/kernel/ntqnetworkprotocol.h
+++ b/src/kernel/tqnetworkprotocol.h
@@ -42,7 +42,7 @@
 #define TQNETWORKPROTOCOL_H
 
 #ifndef QT_H
-#include "ntqurlinfo.h"
+#include "tqurlinfo.h"
 #include "tqstring.h"
 #include "tqdict.h"
 #include "tqobject.h"
diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp
index 293f374e5..ac7a405ef 100644
--- a/src/kernel/tqobject.cpp
+++ b/src/kernel/tqobject.cpp
@@ -42,7 +42,7 @@
 #include "ntqapplication.h"
 #include "tqobject.h"
 #include "tqobjectlist.h"
-#include "ntqsignalslotimp.h"
+#include "tqsignalslotimp.h"
 #include "tqregexp.h"
 #include "ntqmetaobject.h"
 #include <private/qucom_p.h>
diff --git a/src/kernel/qprocess.cpp b/src/kernel/tqprocess.cpp
index f052c9cb8..b3837d7d9 100644
--- a/src/kernel/qprocess.cpp
+++ b/src/kernel/tqprocess.cpp
@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "ntqprocess.h"
+#include "tqprocess.h"
 
 #ifndef TQT_NO_PROCESS
 
@@ -53,7 +53,7 @@
 
 
 /*!
-    \class TQProcess ntqprocess.h
+    \class TQProcess tqprocess.h
 
     \brief The TQProcess class is used to start external programs and
     to communicate with them.
diff --git a/src/kernel/ntqprocess.h b/src/kernel/tqprocess.h
index 69dba4d6c..40b6c11a5 100644
--- a/src/kernel/ntqprocess.h
+++ b/src/kernel/tqprocess.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqobject.h"
 #include "tqstringlist.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 #endif // QT_H
 
 #ifndef TQT_NO_PROCESS
diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/tqprocess_unix.cpp
index a8ed9e4da..e065de514 100644
--- a/src/kernel/qprocess_unix.cpp
+++ b/src/kernel/tqprocess_unix.cpp
@@ -45,14 +45,14 @@
 #undef connect
 #endif
 
-#include "ntqprocess.h"
+#include "tqprocess.h"
 
 #ifndef TQT_NO_PROCESS
 
 #include "ntqapplication.h"
 #include "tqptrqueue.h"
 #include "tqptrlist.h"
-#include "ntqsocketnotifier.h"
+#include "tqsocketnotifier.h"
 #include "tqtimer.h"
 #include "ntqcleanuphandler.h"
 #include "tqregexp.h"
@@ -201,7 +201,7 @@ private:
     TQSocketNotifier *sn;
 };
 
-static void qprocess_cleanup()
+static void tqprocess_cleanup()
 {
     delete TQProcessPrivate::procManager;
     TQProcessPrivate::procManager = 0;
@@ -359,7 +359,7 @@ void TQProcessManager::cleanup()
 void TQProcessManager::removeMe()
 {
     if ( procList->count() == 0 ) {
-	tqRemovePostRoutine(qprocess_cleanup);
+	tqRemovePostRoutine(tqprocess_cleanup);
 	TQProcessPrivate::procManager = 0;
 	delete this;
     }
@@ -469,7 +469,7 @@ void TQProcessManager::sigchldHnd( int fd )
 	sn->setEnabled( TRUE );
 }
 
-#include "qprocess_unix.moc"
+#include "tqprocess_unix.moc"
 
 
 /***********************************************************************
@@ -545,7 +545,7 @@ void TQProcessPrivate::newProc( pid_t pid, TQProcess *process )
     proc = new TQProc( pid, process );
     if ( procManager == 0 ) {
 	procManager = new TQProcessManager;
-	tqAddPostRoutine(qprocess_cleanup);
+	tqAddPostRoutine(tqprocess_cleanup);
     }
     // the TQProcessManager takes care of deleting the TQProc instances
     procManager->append( proc );
@@ -792,7 +792,7 @@ bool TQProcess::start( TQStringList *env )
     // in case the process exits quickly.
     if ( d->procManager == 0 ) {
 	d->procManager = new TQProcessManager;
-	tqAddPostRoutine(qprocess_cleanup);
+	tqAddPostRoutine(tqprocess_cleanup);
     }
 
     // fork and exec
diff --git a/src/kernel/qsignal.cpp b/src/kernel/tqsignal.cpp
index f9c6c233a..22e325031 100644
--- a/src/kernel/qsignal.cpp
+++ b/src/kernel/tqsignal.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "ntqsignal.h"
+#include "tqsignal.h"
 #include "ntqmetaobject.h"
 #include "ntqguardedptr.h"
 
 /*!
-    \class TQSignal ntqsignal.h
+    \class TQSignal tqsignal.h
     \brief The TQSignal class can be used to send signals for classes
     that don't inherit TQObject.
 
@@ -67,7 +67,7 @@
 
     Example:
     \code
-	#include <ntqsignal.h>
+	#include <tqsignal.h>
 
 	class MyClass
 	{
diff --git a/src/kernel/ntqsignal.h b/src/kernel/tqsignal.h
index bb3875a09..bb3875a09 100644
--- a/src/kernel/ntqsignal.h
+++ b/src/kernel/tqsignal.h
diff --git a/src/kernel/qsignalmapper.cpp b/src/kernel/tqsignalmapper.cpp
index aff53a3c2..08a7b9400 100644
--- a/src/kernel/qsignalmapper.cpp
+++ b/src/kernel/tqsignalmapper.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsignalmapper.h"
+#include "tqsignalmapper.h"
 #ifndef TQT_NO_SIGNALMAPPER
 #include "tqptrdict.h"
 
@@ -67,7 +67,7 @@ public:
 };
 
 /*!
-    \class TQSignalMapper ntqsignalmapper.h
+    \class TQSignalMapper tqsignalmapper.h
     \brief The TQSignalMapper class bundles signals from identifiable senders.
 
     \ingroup io
diff --git a/src/kernel/ntqsignalmapper.h b/src/kernel/tqsignalmapper.h
index aed7e72d4..aed7e72d4 100644
--- a/src/kernel/ntqsignalmapper.h
+++ b/src/kernel/tqsignalmapper.h
diff --git a/src/kernel/ntqsignalslotimp.h b/src/kernel/tqsignalslotimp.h
index 80c18b5d2..80c18b5d2 100644
--- a/src/kernel/ntqsignalslotimp.h
+++ b/src/kernel/tqsignalslotimp.h
diff --git a/src/kernel/tqsize.cpp b/src/kernel/tqsize.cpp
index ba9c3df6b..f35ad18a5 100644
--- a/src/kernel/tqsize.cpp
+++ b/src/kernel/tqsize.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "tqsize.h"
-#include "ntqdatastream.h"
+#include "tqdatastream.h"
 
 
 /*!
diff --git a/src/kernel/qsocketnotifier.cpp b/src/kernel/tqsocketnotifier.cpp
index b89a512ed..1a6390893 100644
--- a/src/kernel/qsocketnotifier.cpp
+++ b/src/kernel/tqsocketnotifier.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsocketnotifier.h"
+#include "tqsocketnotifier.h"
 #include "ntqapplication.h"
 #include "ntqevent.h"
 #include "ntqeventloop.h"
@@ -50,7 +50,7 @@
 
 
 /*!
-    \class TQSocketNotifier ntqsocketnotifier.h
+    \class TQSocketNotifier tqsocketnotifier.h
     \brief The TQSocketNotifier class provides support for socket callbacks.
 
     \ingroup io
diff --git a/src/kernel/ntqsocketnotifier.h b/src/kernel/tqsocketnotifier.h
index 717be3898..717be3898 100644
--- a/src/kernel/ntqsocketnotifier.h
+++ b/src/kernel/tqsocketnotifier.h
diff --git a/src/kernel/tqtimer.cpp b/src/kernel/tqtimer.cpp
index 11fecf81f..3d19923e8 100644
--- a/src/kernel/tqtimer.cpp
+++ b/src/kernel/tqtimer.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "tqtimer.h"
-#include "ntqsignal.h"
+#include "tqsignal.h"
 #include "tqobjectlist.h"
 
 /*!
diff --git a/src/kernel/tqttdeintegration_x11.cpp b/src/kernel/tqttdeintegration_x11.cpp
index cf96ba280..c1b99f188 100644
--- a/src/kernel/tqttdeintegration_x11.cpp
+++ b/src/kernel/tqttdeintegration_x11.cpp
@@ -4,7 +4,7 @@
 #include "tqttdeintegration_x11_p.h"
 
 #include <ntqcolordialog.h>
-#include <ntqfiledialog.h>
+#include <tqfiledialog.h>
 #include <ntqfontdialog.h>
 #include <ntqlibrary.h>
 #include <tqregexp.h>
diff --git a/src/kernel/qurl.cpp b/src/kernel/tqurl.cpp
index 827e6875d..d2fcd9c59 100644
--- a/src/kernel/qurl.cpp
+++ b/src/kernel/tqurl.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqurl.h"
+#include "tqurl.h"
 
 #ifndef TQT_NO_URL
 
-#include "ntqdir.h"
+#include "tqdir.h"
 
 #include <stdlib.h>
 
@@ -92,7 +92,7 @@ static void slashify( TQString& s, bool allowMultiple = TRUE )
 
 
 /*!
-    \class TQUrl ntqurl.h
+    \class TQUrl tqurl.h
 
     \brief The TQUrl class provides a URL parser and simplifies working with URLs.
 \if defined(commercial)
diff --git a/src/kernel/ntqurl.h b/src/kernel/tqurl.h
index 741719d44..741719d44 100644
--- a/src/kernel/ntqurl.h
+++ b/src/kernel/tqurl.h
diff --git a/src/kernel/qurlinfo.cpp b/src/kernel/tqurlinfo.cpp
index 30ea9738d..5f1c9e519 100644
--- a/src/kernel/qurlinfo.cpp
+++ b/src/kernel/tqurlinfo.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "ntqurlinfo.h"
+#include "tqurlinfo.h"
 
 #ifndef TQT_NO_NETWORKPROTOCOL
 
-#include "ntqurloperator.h"
-#include "ntqdir.h"
+#include "tqurloperator.h"
+#include "tqdir.h"
 #include <limits.h>
 
 class TQUrlInfoPrivate
@@ -81,7 +81,7 @@ public:
 
 
 /*!
-    \class TQUrlInfo ntqurlinfo.h
+    \class TQUrlInfo tqurlinfo.h
     \brief The TQUrlInfo class stores information about URLs.
 
     \ingroup io
@@ -243,7 +243,7 @@ TQUrlInfo::TQUrlInfo( const TQUrl &url, int permissions, const TQString &owner,
 
 /*!
     Sets the name of the URL to \a name. The name is the full text,
-    for example, "http://doc.trolltech.com/ntqurlinfo.html".
+    for example, "http://doc.trolltech.com/tqurlinfo.html".
 
     If you call this function for an invalid URL info, this function
     turns it into a valid one.
diff --git a/src/kernel/ntqurlinfo.h b/src/kernel/tqurlinfo.h
index 8c0269f84..8c0269f84 100644
--- a/src/kernel/ntqurlinfo.h
+++ b/src/kernel/tqurlinfo.h
diff --git a/src/kernel/qurloperator.cpp b/src/kernel/tqurloperator.cpp
index 5dc39e29c..f7705bc2e 100644
--- a/src/kernel/qurloperator.cpp
+++ b/src/kernel/tqurloperator.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "ntqurloperator.h"
+#include "tqurloperator.h"
 
 #ifndef TQT_NO_NETWORKPROTOCOL
 
-#include "ntqurlinfo.h"
-#include "ntqnetworkprotocol.h"
+#include "tqurlinfo.h"
+#include "tqnetworkprotocol.h"
 #include "tqmap.h"
-#include "ntqdir.h"
+#include "tqdir.h"
 #include "tqptrdict.h"
 #include "ntqguardedptr.h"
 
@@ -89,7 +89,7 @@ public:
 };
 
 /*!
-    \class TQUrlOperator ntqurloperator.h
+    \class TQUrlOperator tqurloperator.h
 
     \brief The TQUrlOperator class provides common operations on URLs.
 \if defined(commercial)
diff --git a/src/kernel/ntqurloperator.h b/src/kernel/tqurloperator.h
index eedc6bb29..bad14db39 100644
--- a/src/kernel/ntqurloperator.h
+++ b/src/kernel/tqurloperator.h
@@ -43,9 +43,9 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqurl.h"
+#include "tqurl.h"
 #include "tqptrlist.h"
-#include "ntqnetworkprotocol.h"
+#include "tqnetworkprotocol.h"
 #include "tqstringlist.h" // TQString->TQStringList conversion
 #endif // QT_H
 
diff --git a/src/kernel/tqwidget_p.h b/src/kernel/tqwidget_p.h
index 7dff862e5..0c0eb9460 100644
--- a/src/kernel/tqwidget_p.h
+++ b/src/kernel/tqwidget_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qapplication_*.cpp, tqwidget*.cpp and qfiledialog.cpp.  This header
+// of qapplication_*.cpp, tqwidget*.cpp and tqfiledialog.cpp.  This header
 // file may change from version to version without notice, or even be removed.
 //
 // We mean it.