Rename remaining ntq[d-h]* related files to equivalent tq*

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

70 files changed, 119 insertions, 119 deletions

diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp
index 8d61ec333..a459846df 100644
--- a/src/dialogs/qinputdialog.cpp
+++ b/src/dialogs/qinputdialog.cpp
@@ -49,7 +49,7 @@
 #include "tqspinbox.h"
 #include "tqcombobox.h"
 #include "tqwidgetstack.h"
-#include "ntqvalidator.h"
+#include "tqvalidator.h"
 #include "ntqapplication.h"
 
 class TQInputDialogPrivate
diff --git a/src/dialogs/qt_dialogs.pri b/src/dialogs/qt_dialogs.pri
index 723b7ba89..4957a1e70 100644
--- a/src/dialogs/qt_dialogs.pri
+++ b/src/dialogs/qt_dialogs.pri
@@ -5,7 +5,7 @@ dialogs {
 
 	HEADERS	+= $$DIALOGS_H/tqcolordialog.h \
 		  $$DIALOGS_H/tqdialog.h \
-		  $$DIALOGS_H/ntqerrormessage.h \
+		  $$DIALOGS_H/tqerrormessage.h \
 		  $$DIALOGS_H/tqfiledialog.h \
 		  $$DIALOGS_H/tqfontdialog.h \
 		  $$DIALOGS_H/ntqmessagebox.h \
@@ -21,7 +21,7 @@ dialogs {
 
 	SOURCES += $$DIALOGS_CPP/tqcolordialog.cpp \
 		  $$DIALOGS_CPP/tqdialog.cpp \
-		  $$DIALOGS_CPP/qerrormessage.cpp \
+		  $$DIALOGS_CPP/tqerrormessage.cpp \
 		  $$DIALOGS_CPP/tqfiledialog.cpp \
 		  $$DIALOGS_CPP/tqfontdialog.cpp \
 		  $$DIALOGS_CPP/qmessagebox.cpp \
diff --git a/src/dialogs/tqcolordialog.cpp b/src/dialogs/tqcolordialog.cpp
index 56f610036..feaefb010 100644
--- a/src/dialogs/tqcolordialog.cpp
+++ b/src/dialogs/tqcolordialog.cpp
@@ -49,8 +49,8 @@
 #include "tqlineedit.h"
 #include "tqimage.h"
 #include "tqpixmap.h"
-#include "ntqdrawutil.h"
-#include "ntqvalidator.h"
+#include "tqdrawutil.h"
+#include "tqvalidator.h"
 #include "tqdragobject.h"
 #include "tqgridview.h"
 #include "ntqapplication.h"
diff --git a/src/dialogs/tqdialog.cpp b/src/dialogs/tqdialog.cpp
index 8b1298728..1f620cb6a 100644
--- a/src/dialogs/tqdialog.cpp
+++ b/src/dialogs/tqdialog.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_DIALOG
 
 #include "tqpushbutton.h"
-#include "ntqfocusdata.h"
+#include "tqfocusdata.h"
 #include "ntqapplication.h"
 #include "tqobjectlist.h"
 #include "tqwidgetlist.h"
diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/tqerrormessage.cpp
index 53691afe7..2caa09498 100644
--- a/src/dialogs/qerrormessage.cpp
+++ b/src/dialogs/tqerrormessage.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqerrormessage.h"
+#include "tqerrormessage.h"
 
 #ifndef TQT_NO_ERRORMESSAGE
 
@@ -102,7 +102,7 @@ In both cases TQErrorMessage will queue pending messages, and display
 them (or not) in order, as soon as the user presses Enter or clicks OK
 after seeing each message.
 
-\img qerrormessage.png
+\img tqerrormessage.png
 
 \sa TQMessageBox TQStatusBar::message()
 */
diff --git a/src/dialogs/ntqerrormessage.h b/src/dialogs/tqerrormessage.h
index 21e12a488..21e12a488 100644
--- a/src/dialogs/ntqerrormessage.h
+++ b/src/dialogs/tqerrormessage.h
diff --git a/src/dialogs/tqfontdialog.cpp b/src/dialogs/tqfontdialog.cpp
index d7a39390e..e16148a7b 100644
--- a/src/dialogs/tqfontdialog.cpp
+++ b/src/dialogs/tqfontdialog.cpp
@@ -57,7 +57,7 @@
 #include "tqfontdatabase.h"
 #include "tqstyle.h"
 #include <private/tqfontdata_p.h>
-#include <ntqvalidator.h>
+#include <tqvalidator.h>
 
 #ifdef TQ_WS_X11
 #include "private/tqttdeintegration_x11_p.h"
diff --git a/src/dialogs/tqprogressdialog.cpp b/src/dialogs/tqprogressdialog.cpp
index c8a164d1f..27d2f78bf 100644
--- a/src/dialogs/tqprogressdialog.cpp
+++ b/src/dialogs/tqprogressdialog.cpp
@@ -44,7 +44,7 @@
 
 #include "tqaccel.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqdatetime.h"
 #include "ntqapplication.h"
 #include "tqstyle.h"
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 477e2ca68..e04574828 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -16,7 +16,7 @@
 #ifndef QT_H
 #define QT_H
 #include "tqglobal.h"
-#include "ntqfeatures.h"
+#include "tqfeatures.h"
 #include "ntqshared.h"
 #include "tqptrcollection.h"
 #include "tqglist.h"
@@ -60,7 +60,7 @@
 #include "tqcolor.h"
 #include <tqdom.h>
 #include "tqobject.h"
-#include <ntqdrawutil.h>
+#include <tqdrawutil.h>
 #include "tqbrush.h"
 #include "tqpalette.h"
 #include "tqwidget.h"
@@ -81,13 +81,13 @@
 #include "tqgroupbox.h"
 #include "tqdialog.h"
 #include <tqdataview.h>
-#include "ntqdockwindow.h"
+#include "tqdockwindow.h"
 #include "tqcommonstyle.h"
 #include "tqnetworkprotocol.h"
 #include <tqeuckrcodec.h>
 #include <tqgb18030codec.h>
 #include "tqgcache.h"
-#include <ntqgif.h>
+#include <tqgif.h>
 #include <tqglcolormap.h>
 #include <tqcache.h>
 #include <tqdropsite.h>
@@ -156,7 +156,7 @@
 #include <tqplatinumstyle.h>
 #include <tqpngio.h>
 #include <tqcursor.h>
-#include <ntqerrormessage.h>
+#include <tqerrormessage.h>
 #include <ntqpolygonscanner.h>
 #include "tqpopupmenu.h"
 #include <ntqprintdialog.h>
@@ -172,7 +172,7 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqdial.h>
-#include <ntqdockarea.h>
+#include <tqdockarea.h>
 #include "tqregexp.h"
 #include <tqclipboard.h>
 #include <tqhebrewcodec.h>
@@ -248,7 +248,7 @@
 #include <tqfiledialog.h>
 #include <tqutfcodec.h>
 #include <ntquuid.h>
-#include <ntqvalidator.h>
+#include <tqvalidator.h>
 #include <tqasyncimageio.h>
 #include <tqvaluestack.h>
 #include <tqvaluevector.h>
@@ -260,7 +260,7 @@
 #include <tqwhatsthis.h>
 #include <ntqapplication.h>
 #include <tqwidgetintdict.h>
-#include <ntqfocusdata.h>
+#include <tqfocusdata.h>
 #include <tqwidgetplugin.h>
 #include <tqwidgetstack.h>
 #include <tqcheckbox.h>
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 6e1926e45..a4fded7f0 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -410,8 +410,8 @@ TQEventLoop* TQApplication::currentEventLoop() {
 #endif
 
 #ifndef TQT_NO_ACCEL
-extern bool tqt_dispatchAccelEvent( TQWidget*, TQKeyEvent* ); // def in qaccel.cpp
-extern bool tqt_tryComposeUnicode( TQWidget*, TQKeyEvent* ); // def in qaccel.cpp
+extern bool tqt_dispatchAccelEvent( TQWidget*, TQKeyEvent* ); // def in tqaccel.cpp
+extern bool tqt_tryComposeUnicode( TQWidget*, TQKeyEvent* ); // def in tqaccel.cpp
 #endif
 
 #if defined(QT_TABLET_SUPPORT)
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index 3e378fb47..247e181d9 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -56,7 +56,7 @@
 #include "tqdragobject.h"
 #include "tqpaintdevicemetrics.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqcursor.h"
 #include "tqptrstack.h"
 #include "tqptrdict.h"
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index c3b5c4b2d..d52783f7c 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -18,19 +18,19 @@ kernel {
 		  $$KERNEL_H/tqcursor.h \
 		  $$KERNEL_H/tqdesktopwidget.h \
 		  $$KERNEL_H/tqdragobject.h \
-		  $$KERNEL_H/ntqdrawutil.h \
+		  $$KERNEL_H/tqdrawutil.h \
 		  $$KERNEL_H/tqdropsite.h \
 		  $$KERNEL_H/tqevent.h \
 		  $$KERNEL_H/tqeventloop.h \
 		  $$KERNEL_P/tqeventloop_p.h \
 		  $$KERNEL_P/tqeventloop_glib_p.h \
-		  $$KERNEL_H/ntqfocusdata.h \
+		  $$KERNEL_H/tqfocusdata.h \
 		  $$KERNEL_H/tqfont.h \
 		  $$KERNEL_P/tqfontdata_p.h \
 		  $$KERNEL_H/tqfontinfo.h \
 		  $$KERNEL_H/tqfontmetrics.h \
 		  $$KERNEL_H/tqguardedptr.h \
-		  $$KERNEL_H/ntqgif.h \
+		  $$KERNEL_H/tqgif.h \
 		  $$KERNEL_H/tqiconset.h \
 		  $$KERNEL_H/tqimage.h \
 		  $$KERNEL_P/tqimageformatinterface_p.h \
@@ -206,11 +206,11 @@ kernel {
 		  $$KERNEL_CPP/tqconnection.cpp \
 		  $$KERNEL_CPP/tqcursor.cpp \
 		  $$KERNEL_CPP/tqdragobject.cpp \
-		  $$KERNEL_CPP/qdrawutil.cpp \
+		  $$KERNEL_CPP/tqdrawutil.cpp \
 		  $$KERNEL_CPP/tqdropsite.cpp \
 		  $$KERNEL_CPP/tqevent.cpp \
 		  $$KERNEL_CPP/tqeventloop.cpp \
-		  $$KERNEL_CPP/qfocusdata.cpp \
+		  $$KERNEL_CPP/tqfocusdata.cpp \
 		  $$KERNEL_CPP/tqfont.cpp \
 		  $$KERNEL_CPP/tqfontdatabase.cpp \
 		  $$KERNEL_CPP/tqguardedptr.cpp \
diff --git a/src/kernel/tqaccel.cpp b/src/kernel/tqaccel.cpp
index c5fcc30e6..39e0213f0 100644
--- a/src/kernel/tqaccel.cpp
+++ b/src/kernel/tqaccel.cpp
@@ -49,7 +49,7 @@
 #include "tqwhatsthis.h"
 #include "tqguardedptr.h"
 #include "tqstatusbar.h"
-#include "ntqdockwindow.h"
+#include "tqdockwindow.h"
 #include "tqsignalslotimp.h"
 /*!
     \class TQAccel tqaccel.h
diff --git a/src/kernel/tqasyncimageio.cpp b/src/kernel/tqasyncimageio.cpp
index 56126b3d8..f4a144c1b 100644
--- a/src/kernel/tqasyncimageio.cpp
+++ b/src/kernel/tqasyncimageio.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_ASYNC_IMAGE_IO
 
 #include "tqptrlist.h"
-#include "ntqgif.h"
+#include "tqgif.h"
 #include <stdlib.h>
 
 extern void tqt_init_image_handlers();
@@ -178,7 +178,7 @@ extern void tqt_init_image_plugins();
     \legalese
 
     TQt supports GIF reading if it is configured that way during
-    installation (see ntqgif.h). If it is, we are required to state that
+    installation (see tqgif.h). If it is, we are required to state that
     "The Graphics Interchange Format(c) is the Copyright property of
     CompuServe Incorporated. GIF(sm) is a Service Mark property of
     CompuServe Incorporated."
@@ -199,7 +199,7 @@ static const int max_header = 32;
 
 
 
-// See ntqgif.h for important information regarding this option
+// See tqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
 class TQGIFFormat : public TQImageFormat {
 public:
@@ -299,7 +299,7 @@ public:
     {
 	if ( !factories ) {
 	    factories = new TQPtrList<TQImageFormatType>;
-// See ntqgif.h for important information regarding this option
+// See tqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
 	    gif_decoder_factory = new TQGIFFormatType;
 #endif
@@ -310,7 +310,7 @@ public:
 
     static TQPtrList<TQImageFormatType> * factories;
 
-// See ntqgif.h for important information regarding this option
+// See tqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
     static TQGIFFormatType * gif_decoder_factory;
 #endif
@@ -320,7 +320,7 @@ public:
 };
 
 TQPtrList<TQImageFormatType> * TQImageDecoderPrivate::factories = 0;
-// See ntqgif.h for important information regarding this option
+// See tqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
 TQGIFFormatType * TQImageDecoderPrivate::gif_decoder_factory = 0;
 #endif
@@ -330,7 +330,7 @@ void TQImageDecoderPrivate::cleanup()
 {
     delete factories;
     factories = 0;
-// See ntqgif.h for important information regarding this option
+// See tqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
     delete gif_decoder_factory;
     gif_decoder_factory = 0;
@@ -659,7 +659,7 @@ bool qt_builtin_gif_reader()
 #endif
 }
 
-// See ntqgif.h for important information regarding this option
+// See tqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
 
 /* -- NOTDOC
diff --git a/src/kernel/tqdragobject.cpp b/src/kernel/tqdragobject.cpp
index f8557de55..b6fac2bd0 100644
--- a/src/kernel/tqdragobject.cpp
+++ b/src/kernel/tqdragobject.cpp
@@ -51,7 +51,7 @@
 #include "tqpoint.h"
 #include "tqwidget.h"
 #include "tqbuffer.h"
-#include "ntqgif.h"
+#include "tqgif.h"
 #include "tqregexp.h"
 #include "tqdir.h"
 #include <ctype.h>
diff --git a/src/kernel/qdrawutil.cpp b/src/kernel/tqdrawutil.cpp
index 8abb9216f..0c3283ddc 100644
--- a/src/kernel/qdrawutil.cpp
+++ b/src/kernel/tqdrawutil.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #ifndef TQT_NO_DRAWUTIL
 #include "tqbitmap.h"
 #include "tqpixmapcache.h"
@@ -48,7 +48,7 @@
 /*!
     \relates TQPainter
 
-    \c{#include <ntqdrawutil.h>}
+    \c{#include <tqdrawutil.h>}
 
     Draws a horizontal (\a y1 == \a y2) or vertical (\a x1 == \a x2)
     shaded line using the painter \a p.
@@ -166,7 +166,7 @@ void qDrawShadeLine( TQPainter *p, int x1, int y1, int x2, int y2,
 /*!
     \relates TQPainter
 
-    \c{#include <ntqdrawutil.h>}
+    \c{#include <tqdrawutil.h>}
 
     Draws the shaded rectangle specified by (\a x, \a y, \a w, \a h)
     using the painter \a p.
@@ -272,7 +272,7 @@ void qDrawShadeRect( TQPainter *p, int x, int y, int w, int h,
 /*!
     \relates TQPainter
 
-    \c{#include <ntqdrawutil.h>}
+    \c{#include <tqdrawutil.h>}
 
     Draws the shaded panel specified by (\a x, \a y, \a w, \a h) using
     the painter \a p.
@@ -427,7 +427,7 @@ static void qDrawWinShades( TQPainter *p,
 /*!
     \relates TQPainter
 
-    \c{#include <ntqdrawutil.h>}
+    \c{#include <tqdrawutil.h>}
 
     Draws the Windows-style button specified by (\a x, \a y, \a w, \a
     h) using the painter \a p.
@@ -466,7 +466,7 @@ void qDrawWinButton( TQPainter *p, int x, int y, int w, int h,
 /*!
     \relates TQPainter
 
-    \c{#include <ntqdrawutil.h>}
+    \c{#include <tqdrawutil.h>}
 
     Draws the Windows-style panel specified by (\a x, \a y, \a w, \a
     h) using the painter \a p.
@@ -508,7 +508,7 @@ void qDrawWinPanel( TQPainter *p, int x, int y, int w, int h,
 /*!
     \relates TQPainter
 
-    \c{#include <ntqdrawutil.h>}
+    \c{#include <tqdrawutil.h>}
 
     Draws the plain rectangle specified by (\a x, \a y, \a w, \a h)
     using the painter \a p.
diff --git a/src/kernel/ntqdrawutil.h b/src/kernel/tqdrawutil.h
index d8e2703d2..d8e2703d2 100644
--- a/src/kernel/ntqdrawutil.h
+++ b/src/kernel/tqdrawutil.h
diff --git a/src/kernel/qfocusdata.cpp b/src/kernel/tqfocusdata.cpp
index 0f06da4e3..87ef60534 100644
--- a/src/kernel/qfocusdata.cpp
+++ b/src/kernel/tqfocusdata.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "ntqfocusdata.h"
+#include "tqfocusdata.h"
 
 /*!
-    \class TQFocusData ntqfocusdata.h
+    \class TQFocusData tqfocusdata.h
     \brief The TQFocusData class maintains the list of widgets in the focus
     chain.
 
diff --git a/src/kernel/ntqfocusdata.h b/src/kernel/tqfocusdata.h
index f6eb57fe3..f6eb57fe3 100644
--- a/src/kernel/ntqfocusdata.h
+++ b/src/kernel/tqfocusdata.h
diff --git a/src/kernel/ntqgif.h b/src/kernel/tqgif.h
index 9d1658a0c..9d1658a0c 100644
--- a/src/kernel/ntqgif.h
+++ b/src/kernel/tqgif.h
diff --git a/src/kernel/tqmovie.cpp b/src/kernel/tqmovie.cpp
index 1a29a4315..6350f5ceb 100644
--- a/src/kernel/tqmovie.cpp
+++ b/src/kernel/tqmovie.cpp
@@ -90,7 +90,7 @@
 
     The supported formats are MNG (if TQt is configured with MNG
     support enabled) and GIF (if TQt is configured with GIF support
-    enabled, see ntqgif.h).
+    enabled, see tqgif.h).
 
     If TQt is configured to support GIF reading, we are required to
     state that "The Graphics Interchange Format(c) is the Copyright
diff --git a/src/kernel/tqpainter.cpp b/src/kernel/tqpainter.cpp
index 359954168..b2c0d5fba 100644
--- a/src/kernel/tqpainter.cpp
+++ b/src/kernel/tqpainter.cpp
@@ -232,7 +232,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack;
     platforms may behave incorrectly with coordinates as small as
     +/-4000.
 
-    \headerfile ntqdrawutil.h
+    \headerfile tqdrawutil.h
 
     \sa TQPaintDevice TQWidget TQPixmap TQPrinter TQPicture
 	\link simple-application.html Application Walkthrough \endlink
diff --git a/src/kernel/tqurl.cpp b/src/kernel/tqurl.cpp
index d2fcd9c59..1155e9fa1 100644
--- a/src/kernel/tqurl.cpp
+++ b/src/kernel/tqurl.cpp
@@ -126,13 +126,13 @@ static void slashify( TQString& s, bool allowMultiple = TRUE )
 
     Example:
 
-    <tt>http://doc.trolltech.com/ntqdockarea.html#lines</tt>
+    <tt>http://doc.trolltech.com/tqdockarea.html#lines</tt>
 
     \table
     \header \i Function	    \i Returns
     \row \i \l protocol()   \i "http"
     \row \i \l host()	    \i "doc.trolltech.com"
-    \row \i \l fileName()   \i "ntqdockarea.html"
+    \row \i \l fileName()   \i "tqdockarea.html"
     \row \i \l ref()	    \i "lines"
     \endtable
 
diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp
index 9fe528f78..d0e37df41 100644
--- a/src/kernel/tqwidget.cpp
+++ b/src/kernel/tqwidget.cpp
@@ -44,7 +44,7 @@
 #include "tqwidgetlist.h"
 #include "tqwidgetintdict.h"
 #include "tqptrdict.h"
-#include "ntqfocusdata.h"
+#include "tqfocusdata.h"
 #include "tqcursor.h"
 #include "tqpixmap.h"
 #include "ntqapplication.h"
diff --git a/src/libqt.map b/src/libqt.map
index bc20283fb..81a903a16 100644
--- a/src/libqt.map
+++ b/src/libqt.map
@@ -9,7 +9,7 @@
   {
 	TQClipboardWatcher::*;
 	TQColorLuminancePicker::*;
-	QErrorMessageTextView::*;
+	TQErrorMessageTextView::*;
 	QETWidget::*;
 	QFDProgress*;
 	TQFileDialogTQFileListView::*;
diff --git a/src/styles/tqcdestyle.cpp b/src/styles/tqcdestyle.cpp
index 3c5321386..2c3b103da 100644
--- a/src/styles/tqcdestyle.cpp
+++ b/src/styles/tqcdestyle.cpp
@@ -43,7 +43,7 @@
 #if !defined(TQT_NO_STYLE_CDE) || defined(QT_PLUGIN)
 
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqbutton.h"
 #include <limits.h>
 
diff --git a/src/styles/tqcommonstyle.cpp b/src/styles/tqcommonstyle.cpp
index 81a3ace92..6158189d5 100644
--- a/src/styles/tqcommonstyle.cpp
+++ b/src/styles/tqcommonstyle.cpp
@@ -46,7 +46,7 @@
 #include "tqmenubar.h"
 #include "ntqapplication.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqpixmap.h"
 #include "tqpushbutton.h"
 #include "tqtabbar.h"
@@ -56,7 +56,7 @@
 #include "tqtoolbutton.h"
 #include "tqtoolbar.h"
 #include "tqcombobox.h"
-#include "ntqdockarea.h"
+#include "tqdockarea.h"
 #include "tqheader.h"
 #include "tqspinbox.h"
 #include "ntqrangecontrol.h"
diff --git a/src/styles/tqcompactstyle.cpp b/src/styles/tqcompactstyle.cpp
index b4c510229..440c379e4 100644
--- a/src/styles/tqcompactstyle.cpp
+++ b/src/styles/tqcompactstyle.cpp
@@ -45,7 +45,7 @@
 #include "tqfontmetrics.h"
 #include "tqpalette.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqmenudata.h"
 #include "tqpopupmenu.h"
 
diff --git a/src/styles/tqinterlacestyle.cpp b/src/styles/tqinterlacestyle.cpp
index c0a84c7ae..8ddd55940 100644
--- a/src/styles/tqinterlacestyle.cpp
+++ b/src/styles/tqinterlacestyle.cpp
@@ -46,7 +46,7 @@
 
 #include "ntqapplication.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h" // for now
+#include "tqdrawutil.h" // for now
 #include "tqpalette.h" // for now
 #include "tqwidget.h"
 #include "tqlabel.h"
diff --git a/src/styles/tqmotifplusstyle.cpp b/src/styles/tqmotifplusstyle.cpp
index d1c40292a..2d65a7c4f 100644
--- a/src/styles/tqmotifplusstyle.cpp
+++ b/src/styles/tqmotifplusstyle.cpp
@@ -54,7 +54,7 @@
 #include "tqlineedit.h"
 #include "tqspinbox.h"
 #include "tqslider.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqscrollbar.h"
 #include "tqtabbar.h"
 #include "tqtoolbar.h"
diff --git a/src/styles/tqmotifstyle.cpp b/src/styles/tqmotifstyle.cpp
index 990b339a4..3276bfddb 100644
--- a/src/styles/tqmotifstyle.cpp
+++ b/src/styles/tqmotifstyle.cpp
@@ -45,7 +45,7 @@
 #include "tqpopupmenu.h"
 #include "ntqapplication.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqpixmap.h"
 #include "tqpalette.h"
 #include "tqwidget.h"
@@ -57,8 +57,8 @@
 #include "ntqsplitter.h"
 #include "tqslider.h"
 #include "tqcombobox.h"
-#include "ntqdockwindow.h"
-#include "ntqdockarea.h"
+#include "tqdockwindow.h"
+#include "tqdockarea.h"
 #include "tqprogressbar.h"
 #include "tqimage.h"
 #include <limits.h>
diff --git a/src/styles/tqplatinumstyle.cpp b/src/styles/tqplatinumstyle.cpp
index 28d90cb94..2a2ad20fb 100644
--- a/src/styles/tqplatinumstyle.cpp
+++ b/src/styles/tqplatinumstyle.cpp
@@ -44,7 +44,7 @@
 
 #include "ntqapplication.h"
 #include "tqcombobox.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqpainter.h"
 #include "tqpalette.h"
 #include "tqpixmap.h"
diff --git a/src/styles/tqsgistyle.cpp b/src/styles/tqsgistyle.cpp
index 43e2f7db2..c02b64d20 100644
--- a/src/styles/tqsgistyle.cpp
+++ b/src/styles/tqsgistyle.cpp
@@ -46,7 +46,7 @@
 #include "ntqapplication.h"
 #include "tqbutton.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqpixmap.h"
 #include "tqpalette.h"
 #include "tqwidget.h"
diff --git a/src/styles/tqwindowsstyle.cpp b/src/styles/tqwindowsstyle.cpp
index 42d07b2b7..284da1617 100644
--- a/src/styles/tqwindowsstyle.cpp
+++ b/src/styles/tqwindowsstyle.cpp
@@ -45,7 +45,7 @@
 #include "tqpopupmenu.h"
 #include "ntqapplication.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h" // for now
+#include "tqdrawutil.h" // for now
 #include "tqpixmap.h" // for now
 #include "tqwidget.h"
 #include "tqlabel.h"
@@ -62,7 +62,7 @@
 #include "tqlistview.h"
 #include "tqbitmap.h"
 #include "tqcleanuphandler.h"
-#include "ntqdockwindow.h"
+#include "tqdockwindow.h"
 #include "tqobjectlist.h"
 #include "tqmenubar.h"
 
diff --git a/src/table/tqtable.cpp b/src/table/tqtable.cpp
index 8244304cc..d2270ab80 100644
--- a/src/table/tqtable.cpp
+++ b/src/table/tqtable.cpp
@@ -62,7 +62,7 @@
 #include <tqlistbox.h>
 #include <tqstyle.h>
 #include <tqdatatable.h>
-#include <ntqvalidator.h>
+#include <tqvalidator.h>
 
 #include <stdlib.h>
 #include <limits.h>
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index 92bda3eb7..79c651b3c 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/qwinexport.cpp
@@ -25,5 +25,5 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 #include <tqvaluevector.h>
-#include <ntqdockarea.h>
-#include <ntqdockwindow.h>
+#include <tqdockarea.h>
+#include <tqdockwindow.h>
diff --git a/src/tools/ntqfeatures.h b/src/tools/tqfeatures.h
index acfa7db03..88f7247ad 100644
--- a/src/tools/ntqfeatures.h
+++ b/src/tools/tqfeatures.h
@@ -1,6 +1,6 @@
 // All feature and their dependencies
 //
-// This list is generated from $TQTDIR/src/tools/qfeatures.txt
+// This list is generated from $TQTDIR/src/tools/tqfeatures.txt
 //
 // Asynchronous I/O
 //#define TQT_NO_ASYNC_IO
diff --git a/src/tools/qfeatures.txt b/src/tools/tqfeatures.txt
index 598e45d46..5e7c9c267 100644
--- a/src/tools/qfeatures.txt
+++ b/src/tools/tqfeatures.txt
@@ -1036,7 +1036,7 @@ SeeAlso: ???
 Feature: ERRORMESSAGE
 Section: Widgets
 Requires: DIALOG PUSHBUTTON LABEL CHECKBOX TEXTVIEW
-Name: QErrorMessage
+Name: TQErrorMessage
 SeeAlso: ???
 
 Feature: SESSIONMANAGER
diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h
index 64115edf3..15545d1c7 100644
--- a/src/tools/tqglobal.h
+++ b/src/tools/tqglobal.h
@@ -808,7 +808,7 @@ class TQString;
 #endif
 
 #ifndef QT_H
-#include "ntqfeatures.h"
+#include "tqfeatures.h"
 #endif /* QT_H */
 
 
diff --git a/src/widgets/qsplitter.cpp b/src/widgets/qsplitter.cpp
index cff76bc50..1e6699806 100644
--- a/src/widgets/qsplitter.cpp
+++ b/src/widgets/qsplitter.cpp
@@ -45,7 +45,7 @@
 #include "../kernel/tqlayoutengine_p.h"
 #include "ntqapplication.h"
 #include "tqbitmap.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqmemarray.h"
 #include "tqobjectlist.h"
 #include "tqpainter.h"
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index 7a4e4b3b5..93acd0832 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -10,8 +10,8 @@ widgets {
 		  $$WIDGETS_H/tqcombobox.h \
 		  $$WIDGETS_P/tqwidgetresizehandler_p.h \
 		  $$WIDGETS_H/tqdial.h \
-		  $$WIDGETS_H/ntqdockarea.h \
-		  $$WIDGETS_H/ntqdockwindow.h \
+		  $$WIDGETS_H/tqdockarea.h \
+		  $$WIDGETS_H/tqdockwindow.h \
 		  $$WIDGETS_H/tqframe.h \
 		  $$WIDGETS_H/tqgrid.h \
 		  $$WIDGETS_H/tqgridview.h \
@@ -51,7 +51,7 @@ widgets {
 		  $$WIDGETS_H/tqtoolbox.h \
 		  $$WIDGETS_H/tqtoolbutton.h \
 		  $$WIDGETS_H/tqtooltip.h \
-		  $$WIDGETS_H/ntqvalidator.h \
+		  $$WIDGETS_H/tqvalidator.h \
 		  $$WIDGETS_H/tqvbox.h \
 		  $$WIDGETS_H/tqvbuttongroup.h \
 		  $$WIDGETS_H/tqvgroupbox.h \
@@ -72,8 +72,8 @@ widgets {
 		  $$WIDGETS_CPP/tqcombobox.cpp \
 		  $$WIDGETS_CPP/tqwidgetresizehandler.cpp \
 		  $$WIDGETS_CPP/tqdial.cpp \
-		  $$WIDGETS_CPP/qdockarea.cpp \
-		  $$WIDGETS_CPP/qdockwindow.cpp \
+		  $$WIDGETS_CPP/tqdockarea.cpp \
+		  $$WIDGETS_CPP/tqdockwindow.cpp \
 		  $$WIDGETS_CPP/tqframe.cpp \
 		  $$WIDGETS_CPP/tqgrid.cpp \
 		  $$WIDGETS_CPP/tqgridview.cpp \
@@ -113,7 +113,7 @@ widgets {
 		  $$WIDGETS_CPP/tqtoolbox.cpp \
 		  $$WIDGETS_CPP/tqtoolbutton.cpp \
 		  $$WIDGETS_CPP/tqtooltip.cpp \
-		  $$WIDGETS_CPP/qvalidator.cpp \
+		  $$WIDGETS_CPP/tqvalidator.cpp \
 		  $$WIDGETS_CPP/tqvbox.cpp \
 		  $$WIDGETS_CPP/tqvbuttongroup.cpp \
 		  $$WIDGETS_CPP/tqvgroupbox.cpp \
diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h
index 0a22bd885..e3d20023e 100644
--- a/src/widgets/qtitlebar_p.h
+++ b/src/widgets/qtitlebar_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of tqworkspace.cpp and qdockwindow.cpp.  This header file may change
+// of tqworkspace.cpp and tqdockwindow.cpp.  This header file may change
 // from version to version without notice, or even be removed.
 //
 // We mean it.
diff --git a/src/widgets/tqcheckbox.cpp b/src/widgets/tqcheckbox.cpp
index a9cf27d0d..85c3e1845 100644
--- a/src/widgets/tqcheckbox.cpp
+++ b/src/widgets/tqcheckbox.cpp
@@ -41,7 +41,7 @@
 #include "tqcheckbox.h"
 #ifndef TQT_NO_CHECKBOX
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqpixmap.h"
 #include "tqpixmapcache.h"
 #include "tqbitmap.h"
diff --git a/src/widgets/tqcombobox.cpp b/src/widgets/tqcombobox.cpp
index d431bea96..cc97ffeda 100644
--- a/src/widgets/tqcombobox.cpp
+++ b/src/widgets/tqcombobox.cpp
@@ -43,7 +43,7 @@
 #include "tqpopupmenu.h"
 #include "tqlistbox.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqstrlist.h"
 #include "tqpixmap.h"
 #include "tqtimer.h"
diff --git a/src/widgets/qdockarea.cpp b/src/widgets/tqdockarea.cpp
index a74fbabb8..b3133cfb5 100644
--- a/src/widgets/qdockarea.cpp
+++ b/src/widgets/tqdockarea.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqdockarea.h"
+#include "tqdockarea.h"
 
 #ifndef TQT_NO_MAINWINDOW
 #include "ntqsplitter.h"
@@ -453,7 +453,7 @@ int TQDockAreaLayout::widthForHeight( int h ) const
 
 
 /*!
-    \class TQDockArea ntqdockarea.h
+    \class TQDockArea tqdockarea.h
     \brief The TQDockArea class manages and lays out TQDockWindows.
 
     \ingroup application
@@ -474,7 +474,7 @@ int TQDockAreaLayout::widthForHeight( int h ) const
     that you create a subclass of TQWidget and add your TQDockAreas to
     your subclass.
 
-    \img tqmainwindow-qdockareas.png TQMainWindow's TQDockAreas
+    \img tqmainwindow-tqdockareas.png TQMainWindow's TQDockAreas
 
     \target lines
     \e Lines. TQDockArea uses the concept of lines. A line is a
diff --git a/src/widgets/ntqdockarea.h b/src/widgets/tqdockarea.h
index 9ccdc21d8..ff97e2a8f 100644
--- a/src/widgets/ntqdockarea.h
+++ b/src/widgets/tqdockarea.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqwidget.h"
 #include "tqptrlist.h"
-#include "ntqdockwindow.h"
+#include "tqdockwindow.h"
 #include "tqlayout.h"
 #include "tqvaluelist.h"
 #include "tqguardedptr.h"
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/tqdockwindow.cpp
index 9886e9ea0..4bfe58a8a 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/tqdockwindow.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqdockwindow.h"
+#include "tqdockwindow.h"
 
 #ifndef TQT_NO_MAINWINDOW
 #include "tqdesktopwidget.h"
-#include "ntqdockarea.h"
+#include "tqdockarea.h"
 #include "tqwidgetresizehandler_p.h"
 #include "qtitlebar_p.h"
 #include "tqpainter.h"
@@ -702,7 +702,7 @@ void TQDockWindowTitleBar::mouseDoubleClickEvent( TQMouseEvent * )
 }
 
 /*!
-    \class TQDockWindow ntqdockwindow.h
+    \class TQDockWindow tqdockwindow.h
     \brief The TQDockWindow class provides a widget which can be docked
     inside a TQDockArea or floated as a top level window on the
     desktop.
@@ -715,10 +715,10 @@ void TQDockWindowTitleBar::mouseDoubleClickEvent( TQMouseEvent * )
     functionality provided for dock windows is available with the same
     API for toolbars.
 
-    \img tqmainwindow-qdockareas.png TQDockWindows in a TQDockArea
+    \img tqmainwindow-tqdockareas.png TQDockWindows in a TQDockArea
     \caption Two TQDockWindows (\l{TQToolBar}s) in a \l TQDockArea
 
-    \img qdockwindow.png A TQDockWindow
+    \img tqdockwindow.png A TQDockWindow
     \caption A Floating TQDockWindow
 
     If the user drags the dock window into the dock area the dock
@@ -793,7 +793,7 @@ void TQDockWindowTitleBar::mouseDoubleClickEvent( TQMouseEvent * )
     A dock window can have some preferred settings, for example, you
     can set a preferred offset from the left edge (or top edge for
     vertical dock areas) of the dock area using setOffset(). If you'd
-    prefer a dock window to start on a new \link ntqdockarea.html#lines
+    prefer a dock window to start on a new \link tqdockarea.html#lines
     line\endlink when it is docked use setNewLine(). The
     setFixedExtentWidth() and setFixedExtentHeight() functions can be
     used to define the dock window's preferred size, and the
@@ -2118,6 +2118,6 @@ void TQDockWindow::contextMenuEvent( TQContextMenuEvent *e )
 	e->ignore();
 }
 
-#include "qdockwindow.moc"
+#include "tqdockwindow.moc"
 
 #endif //TQT_NO_MAINWINDOW
diff --git a/src/widgets/ntqdockwindow.h b/src/widgets/tqdockwindow.h
index ad5fa47e7..ad5fa47e7 100644
--- a/src/widgets/ntqdockwindow.h
+++ b/src/widgets/tqdockwindow.h
diff --git a/src/widgets/tqframe.cpp b/src/widgets/tqframe.cpp
index 4966a1329..e6f5f80bc 100644
--- a/src/widgets/tqframe.cpp
+++ b/src/widgets/tqframe.cpp
@@ -41,7 +41,7 @@
 #include "tqframe.h"
 #ifndef TQT_NO_FRAME
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqframe.h"
 #include "tqbitmap.h"
 #include "tqstyle.h"
diff --git a/src/widgets/tqgroupbox.cpp b/src/widgets/tqgroupbox.cpp
index 4a7c84902..c54ff3357 100644
--- a/src/widgets/tqgroupbox.cpp
+++ b/src/widgets/tqgroupbox.cpp
@@ -45,9 +45,9 @@
 #include "tqbitmap.h"
 #include "tqaccel.h"
 #include "tqradiobutton.h"
-#include "ntqfocusdata.h"
+#include "tqfocusdata.h"
 #include "tqobjectlist.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "ntqapplication.h"
 #include "tqstyle.h"
 #include "tqcheckbox.h"
diff --git a/src/widgets/tqheader.cpp b/src/widgets/tqheader.cpp
index 7daa266c7..82df9e63e 100644
--- a/src/widgets/tqheader.cpp
+++ b/src/widgets/tqheader.cpp
@@ -41,7 +41,7 @@
 #include "tqheader.h"
 #ifndef TQT_NO_HEADER
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqpixmap.h"
 #include "tqbitarray.h"
 #include "tqptrvector.h"
diff --git a/src/widgets/tqlabel.cpp b/src/widgets/tqlabel.cpp
index 414e730e5..b1c5807ec 100644
--- a/src/widgets/tqlabel.cpp
+++ b/src/widgets/tqlabel.cpp
@@ -41,7 +41,7 @@
 #include "tqlabel.h"
 #ifndef TQT_NO_LABEL
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqaccel.h"
 #include "tqmovie.h"
 #include "tqimage.h"
diff --git a/src/widgets/tqlineedit.cpp b/src/widgets/tqlineedit.cpp
index 2137a01d4..7cced4e9c 100644
--- a/src/widgets/tqlineedit.cpp
+++ b/src/widgets/tqlineedit.cpp
@@ -47,12 +47,12 @@
 #endif
 
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqfontmetrics.h"
 #include "tqpixmap.h"
 #include "tqclipboard.h"
 #include "ntqapplication.h"
-#include "ntqvalidator.h"
+#include "tqvalidator.h"
 #include "tqdragobject.h"
 #include "tqtimer.h"
 #include "tqpopupmenu.h"
diff --git a/src/widgets/tqmainwindow.cpp b/src/widgets/tqmainwindow.cpp
index f301d2085..609b22289 100644
--- a/src/widgets/tqmainwindow.cpp
+++ b/src/widgets/tqmainwindow.cpp
@@ -59,7 +59,7 @@
 #include "tqdatetime.h"
 #include "tqwhatsthis.h"
 #include "tqbitmap.h"
-#include "ntqdockarea.h"
+#include "tqdockarea.h"
 #include "tqstringlist.h"
 #include "tqstyle.h"
 #ifdef TQ_WS_MACX
diff --git a/src/widgets/tqmenubar.cpp b/src/widgets/tqmenubar.cpp
index 192301ad7..8bedca7a4 100644
--- a/src/widgets/tqmenubar.cpp
+++ b/src/widgets/tqmenubar.cpp
@@ -47,7 +47,7 @@
 #include "tqpopupmenu.h"
 #include "tqaccel.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "ntqapplication.h"
 #include "tqguardedptr.h"
 #include "tqlayout.h"
diff --git a/src/widgets/tqpopupmenu.cpp b/src/widgets/tqpopupmenu.cpp
index 5aba3873a..2e68598d6 100644
--- a/src/widgets/tqpopupmenu.cpp
+++ b/src/widgets/tqpopupmenu.cpp
@@ -43,7 +43,7 @@
 #include "tqmenubar.h"
 #include "tqaccel.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "ntqapplication.h"
 #include "tqpixmap.h"
 #include "tqpixmapcache.h"
diff --git a/src/widgets/tqprogressbar.cpp b/src/widgets/tqprogressbar.cpp
index d3cde6821..7efa4ce48 100644
--- a/src/widgets/tqprogressbar.cpp
+++ b/src/widgets/tqprogressbar.cpp
@@ -41,7 +41,7 @@
 #include "tqprogressbar.h"
 #ifndef TQT_NO_PROGRESSBAR
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqpixmap.h"
 #include "tqstyle.h"
 #include "tqwmatrix.h"
diff --git a/src/widgets/tqpushbutton.cpp b/src/widgets/tqpushbutton.cpp
index 22c054e2d..7e6add688 100644
--- a/src/widgets/tqpushbutton.cpp
+++ b/src/widgets/tqpushbutton.cpp
@@ -43,7 +43,7 @@
 #include "tqdialog.h"
 #include "tqfontmetrics.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqpixmap.h"
 #include "tqbitmap.h"
 #include "tqpopupmenu.h"
diff --git a/src/widgets/tqradiobutton.cpp b/src/widgets/tqradiobutton.cpp
index 30e63970d..eac619f59 100644
--- a/src/widgets/tqradiobutton.cpp
+++ b/src/widgets/tqradiobutton.cpp
@@ -42,7 +42,7 @@
 #ifndef TQT_NO_RADIOBUTTON
 #include "tqbuttongroup.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqpixmap.h"
 #include "tqpixmapcache.h"
 #include "tqbitmap.h"
diff --git a/src/widgets/tqscrollview.cpp b/src/widgets/tqscrollview.cpp
index 71fa86123..2f5e92ea1 100644
--- a/src/widgets/tqscrollview.cpp
+++ b/src/widgets/tqscrollview.cpp
@@ -45,7 +45,7 @@
 #include "tqpainter.h"
 #include "tqpixmap.h"
 #include "tqcursor.h"
-#include "ntqfocusdata.h"
+#include "tqfocusdata.h"
 #include "tqscrollview.h"
 #include "tqptrdict.h"
 #include "ntqapplication.h"
diff --git a/src/widgets/tqslider.cpp b/src/widgets/tqslider.cpp
index ce25334a0..6b020c620 100644
--- a/src/widgets/tqslider.cpp
+++ b/src/widgets/tqslider.cpp
@@ -41,7 +41,7 @@
 #include "tqslider.h"
 #ifndef TQT_NO_SLIDER
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqtimer.h"
 #include "tqbitmap.h"
 #include "ntqapplication.h"
diff --git a/src/widgets/tqspinbox.cpp b/src/widgets/tqspinbox.cpp
index f805b65ba..6c6b38be5 100644
--- a/src/widgets/tqspinbox.cpp
+++ b/src/widgets/tqspinbox.cpp
@@ -46,7 +46,7 @@
 #include "tqpainter.h"
 #include "tqbitmap.h"
 #include "tqlineedit.h"
-#include "ntqvalidator.h"
+#include "tqvalidator.h"
 #include "tqpixmapcache.h"
 #include "ntqapplication.h"
 #include "tqstyle.h"
diff --git a/src/widgets/tqstatusbar.cpp b/src/widgets/tqstatusbar.cpp
index 29aaadfa1..07d071b47 100644
--- a/src/widgets/tqstatusbar.cpp
+++ b/src/widgets/tqstatusbar.cpp
@@ -45,7 +45,7 @@
 #include "tqlayout.h"
 #include "tqpainter.h"
 #include "tqtimer.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqstyle.h"
 #include "tqsizegrip.h"
 
diff --git a/src/widgets/tqtoolbar.cpp b/src/widgets/tqtoolbar.cpp
index a2cfdbf1c..43281cf9a 100644
--- a/src/widgets/tqtoolbar.cpp
+++ b/src/widgets/tqtoolbar.cpp
@@ -48,7 +48,7 @@
 #include "tqframe.h"
 #include "tqobjectlist.h"
 #include "tqpainter.h"
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqtoolbutton.h"
 #include "tqpopupmenu.h"
 #include "tqcombobox.h"
@@ -258,7 +258,7 @@ void TQToolBarSeparator::paintEvent( TQPaintEvent * )
     in the example above) as a child of a TQMainWindow the toolbar will
     be added to the top dock area. You can move it to another dock
     area (or float it) by calling TQMainWindow::moveDockWindow(). TQDock
-    areas lay out their windows in \link ntqdockarea.html#lines
+    areas lay out their windows in \link tqdockarea.html#lines
     Lines\endlink.
 
     If the main window is resized so that the area occupied by the
@@ -284,7 +284,7 @@ void TQToolBarSeparator::paintEvent( TQPaintEvent * )
 
     You can use the clear() method to remove all items from a toolbar.
 
-    \img qdockwindow.png Toolbar (dock window)
+    \img tqdockwindow.png Toolbar (dock window)
     \caption A floating TQToolbar (dock window)
 
     \sa TQToolButton TQMainWindow \link http://www.iarchitect.com/visual.htm Parts of Isys on Visual Design\endlink \link guibooks.html#fowler GUI Design Handbook: Tool Bar\endlink.
diff --git a/src/widgets/tqtoolbar.h b/src/widgets/tqtoolbar.h
index 5571d9931..572cb0d95 100644
--- a/src/widgets/tqtoolbar.h
+++ b/src/widgets/tqtoolbar.h
@@ -42,7 +42,7 @@
 #define TQTOOLBAR_H
 
 #ifndef QT_H
-#include "ntqdockwindow.h"
+#include "tqdockwindow.h"
 #endif // QT_H
 
 #ifndef TQT_NO_TOOLBAR
diff --git a/src/widgets/tqtoolbutton.cpp b/src/widgets/tqtoolbutton.cpp
index 53d4b971f..b44f93b9e 100644
--- a/src/widgets/tqtoolbutton.cpp
+++ b/src/widgets/tqtoolbutton.cpp
@@ -41,7 +41,7 @@
 #include "tqtoolbutton.h"
 #ifndef TQT_NO_TOOLBUTTON
 
-#include "ntqdrawutil.h"
+#include "tqdrawutil.h"
 #include "tqpainter.h"
 #include "tqpixmap.h"
 #include "tqwmatrix.h"
@@ -115,7 +115,7 @@ public:
     TQToolButton you can set a popup menu using setPopup(). The default
     delay is 600ms; you can adjust it with setPopupDelay().
 
-    \img qdockwindow.png Toolbar with Toolbuttons \caption A floating
+    \img tqdockwindow.png Toolbar with Toolbuttons \caption A floating
     TQToolbar with TQToolbuttons
 
     \sa TQPushButton TQToolBar TQMainWindow \link guibooks.html#fowler
diff --git a/src/widgets/qvalidator.cpp b/src/widgets/tqvalidator.cpp
index c23972549..d04a2fa70 100644
--- a/src/widgets/qvalidator.cpp
+++ b/src/widgets/tqvalidator.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqvalidator.h"
+#include "tqvalidator.h"
 #ifndef TQT_NO_VALIDATOR
 
 #include <limits.h>
diff --git a/src/widgets/ntqvalidator.h b/src/widgets/tqvalidator.h
index d167334d7..d167334d7 100644
--- a/src/widgets/ntqvalidator.h
+++ b/src/widgets/tqvalidator.h
diff --git a/src/widgets/tqwidgetstack.cpp b/src/widgets/tqwidgetstack.cpp
index 5cd6f6254..d550fa6ef 100644
--- a/src/widgets/tqwidgetstack.cpp
+++ b/src/widgets/tqwidgetstack.cpp
@@ -44,7 +44,7 @@
 #ifndef TQT_NO_WIDGETSTACK
 
 #include "tqobjectlist.h"
-#include "ntqfocusdata.h"
+#include "tqfocusdata.h"
 #include "tqbutton.h"
 #include "tqbuttongroup.h"
 
diff --git a/src/workspace/tqworkspace.cpp b/src/workspace/tqworkspace.cpp
index 5803cd664..2ab278119 100644
--- a/src/workspace/tqworkspace.cpp
+++ b/src/workspace/tqworkspace.cpp
@@ -54,7 +54,7 @@
 #include "tqguardedptr.h"
 #include "tqiconset.h"
 #include "../widgets/tqwidgetresizehandler_p.h"
-#include "ntqfocusdata.h"
+#include "tqfocusdata.h"
 #include "tqdatetime.h"
 #include "tqtooltip.h"
 #include "tqwmatrix.h"
@@ -65,10 +65,10 @@
 
 // magic non-mdi things
 #include "tqtimer.h"
-#include "ntqdockarea.h"
+#include "tqdockarea.h"
 #include "tqstatusbar.h"
 #include "tqmainwindow.h"
-#include "ntqdockwindow.h"
+#include "tqdockwindow.h"
 #include "tqtoolbar.h"
 
 #define BUTTON_WIDTH	16