86 files changed, 197 insertions, 197 deletions
diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp
index fee5a49b7..a47604bdc 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/qprintdialog.cpp
@@ -46,18 +46,18 @@
 #include "tqfile.h"
 #include "tqtextstream.h"
 #include "tqcombobox.h"
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "tqlabel.h"
 #include "tqlineedit.h"
 #include "tqpushbutton.h"
 #include "tqprinter.h"
-#include "ntqlistview.h"
+#include "tqlistview.h"
 #include "ntqlayout.h"
-#include "ntqbuttongroup.h"
+#include "tqbuttongroup.h"
 #include "tqradiobutton.h"
 #include "tqspinbox.h"
 #include "ntqapplication.h"
-#include "ntqheader.h"
+#include "tqheader.h"
 #include "tqstyle.h"
 #include "tqstring.h"
 #include "tqregexp.h"
diff --git a/src/dialogs/qt_dialogs.pri b/src/dialogs/qt_dialogs.pri
index e5c17042a..723b7ba89 100644
--- a/src/dialogs/qt_dialogs.pri
+++ b/src/dialogs/qt_dialogs.pri
@@ -9,9 +9,9 @@ dialogs {
 		  $$DIALOGS_H/tqfiledialog.h \
 		  $$DIALOGS_H/tqfontdialog.h \
 		  $$DIALOGS_H/ntqmessagebox.h \
-		  $$DIALOGS_H/ntqprogressdialog.h \
-		  $$DIALOGS_H/ntqtabdialog.h \
-		  $$DIALOGS_H/ntqwizard.h \
+		  $$DIALOGS_H/tqprogressdialog.h \
+		  $$DIALOGS_H/tqtabdialog.h \
+		  $$DIALOGS_H/tqwizard.h \
 		  $$DIALOGS_H/ntqinputdialog.h
 
         !embedded:mac:SOURCES  += $$DIALOGS_CPP/tqfiledialog_mac.cpp $$DIALOGS_CPP/tqcolordialog_mac.cpp
@@ -25,8 +25,8 @@ dialogs {
 		  $$DIALOGS_CPP/tqfiledialog.cpp \
 		  $$DIALOGS_CPP/tqfontdialog.cpp \
 		  $$DIALOGS_CPP/qmessagebox.cpp \
-		  $$DIALOGS_CPP/qprogressdialog.cpp \
-		  $$DIALOGS_CPP/qtabdialog.cpp \
-		  $$DIALOGS_CPP/qwizard.cpp \
+		  $$DIALOGS_CPP/tqprogressdialog.cpp \
+		  $$DIALOGS_CPP/tqtabdialog.cpp \
+		  $$DIALOGS_CPP/tqwizard.cpp \
 		  $$DIALOGS_CPP/qinputdialog.cpp
 }
diff --git a/src/dialogs/tqcolordialog.cpp b/src/dialogs/tqcolordialog.cpp
index 95b7145c8..a92f3af5d 100644
--- a/src/dialogs/tqcolordialog.cpp
+++ b/src/dialogs/tqcolordialog.cpp
@@ -52,7 +52,7 @@
 #include "ntqdrawutil.h"
 #include "ntqvalidator.h"
 #include "tqdragobject.h"
-#include "ntqgridview.h"
+#include "tqgridview.h"
 #include "ntqapplication.h"
 #include "tqstyle.h"
 #include "tqsettings.h"
diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp
index 27ec5d130..5ac7307a0 100644
--- a/src/dialogs/tqfiledialog.cpp
+++ b/src/dialogs/tqfiledialog.cpp
@@ -57,7 +57,7 @@
 #include "private/qapplication_p.h"
 #include "ntqapplication.h"
 #include "tqbitmap.h"
-#include "ntqbuttongroup.h"
+#include "tqbuttongroup.h"
 #include "tqcheckbox.h"
 #include "ntqcleanuphandler.h"
 #include "tqcombobox.h"
@@ -67,13 +67,13 @@
 #include "tqfile.h"
 #include "ntqguardedptr.h"
 #include "ntqhbox.h"
-#include "ntqheader.h"
+#include "tqheader.h"
 #include "tqlabel.h"
 #include "ntqlayout.h"
 #include "ntqlibrary.h"
 #include "tqlineedit.h"
-#include "ntqlistbox.h"
-#include "ntqlistview.h"
+#include "tqlistbox.h"
+#include "tqlistview.h"
 #include "tqmap.h"
 #include "ntqmessagebox.h"
 #include "tqmime.h"
@@ -81,7 +81,7 @@
 #include "tqobjectlist.h"
 #include "tqpainter.h"
 #include "tqpopupmenu.h"
-#include "ntqprogressbar.h"
+#include "tqprogressbar.h"
 #include "tqptrvector.h"
 #include "tqpushbutton.h"
 #include "tqregexp.h"
diff --git a/src/dialogs/tqfontdialog.cpp b/src/dialogs/tqfontdialog.cpp
index e13083b3a..8ea7e9ea0 100644
--- a/src/dialogs/tqfontdialog.cpp
+++ b/src/dialogs/tqfontdialog.cpp
@@ -45,7 +45,7 @@
 #include "tqfontdialog.h"
 
 #include "tqlineedit.h"
-#include "ntqlistbox.h"
+#include "tqlistbox.h"
 #include "tqpushbutton.h"
 #include "tqcheckbox.h"
 #include "tqcombobox.h"
diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/tqprogressdialog.cpp
index 9c74a906e..5731fd240 100644
--- a/src/dialogs/qprogressdialog.cpp
+++ b/src/dialogs/tqprogressdialog.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqprogressdialog.h"
+#include "tqprogressdialog.h"
 
 #ifndef TQT_NO_PROGRESSDIALOG
 
@@ -100,7 +100,7 @@ public:
 
 
 /*!
-  \class TQProgressDialog ntqprogressdialog.h
+  \class TQProgressDialog tqprogressdialog.h
   \brief The TQProgressDialog class provides feedback on the progress of a slow operation.
   \ingroup dialogs
   \mainclass
diff --git a/src/dialogs/ntqprogressdialog.h b/src/dialogs/tqprogressdialog.h
index af20f615b..628d6de19 100644
--- a/src/dialogs/ntqprogressdialog.h
+++ b/src/dialogs/tqprogressdialog.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqdialog.h"
 #include "tqlabel.h"       // ### remove or keep for users' convenience?
-#include "ntqprogressbar.h" // ### remove or keep for users' convenience?
+#include "tqprogressbar.h" // ### remove or keep for users' convenience?
 #endif // QT_H
 
 #ifndef TQT_NO_PROGRESSDIALOG
diff --git a/src/dialogs/qtabdialog.cpp b/src/dialogs/tqtabdialog.cpp
index db439d93f..0d00244e0 100644
--- a/src/dialogs/qtabdialog.cpp
+++ b/src/dialogs/tqtabdialog.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "ntqtabdialog.h"
+#include "tqtabdialog.h"
 
 #ifndef TQT_NO_TABDIALOG
 
 #include "tqobjectlist.h"
-#include "ntqtabbar.h"
-#include "ntqtabwidget.h"
+#include "tqtabbar.h"
+#include "tqtabwidget.h"
 #include "tqpushbutton.h"
 #include "tqpainter.h"
 #include "tqpixmap.h"
 #include "ntqapplication.h"
-#include "ntqtabwidget.h"
+#include "tqtabwidget.h"
 #include "tqwidgetstack.h"
 #include "ntqlayout.h"
 
 /*!
-  \class TQTabDialog ntqtabdialog.h
+  \class TQTabDialog tqtabdialog.h
 
   \brief The TQTabDialog class provides a stack of tabbed widgets.
 
@@ -129,7 +129,7 @@
 
   Most of the functionality in TQTabDialog is provided by a TQTabWidget.
 
-  <img src=qtabdlg-m.png> <img src=qtabdlg-w.png>
+  <img src=tqtabdlg-m.png> <img src=tqtabdlg-w.png>
 
   \sa TQDialog
 */
diff --git a/src/dialogs/ntqtabdialog.h b/src/dialogs/tqtabdialog.h
index 61e4287c6..61e4287c6 100644
--- a/src/dialogs/ntqtabdialog.h
+++ b/src/dialogs/tqtabdialog.h
diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/tqwizard.cpp
index ef3b4e8f4..2b4c46682 100644
--- a/src/dialogs/qwizard.cpp
+++ b/src/dialogs/tqwizard.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqwizard.h"
+#include "tqwizard.h"
 
 #ifndef TQT_NO_WIZARD
 
@@ -56,7 +56,7 @@
 /*! \file wizard/wizard.h */
 
 /*!
-    \class TQWizard ntqwizard.h
+    \class TQWizard tqwizard.h
     \brief The TQWizard class provides a framework for wizard dialogs.
 
     \ingroup abstractwidgets
@@ -100,7 +100,7 @@
 
     Example code is available here: \l wizard/wizard.cpp \l wizard/wizard.h
 
-    \img qwizard.png A TQWizard page
+    \img tqwizard.png A TQWizard page
     \caption A TQWizard page
 
 */
diff --git a/src/dialogs/ntqwizard.h b/src/dialogs/tqwizard.h
index c680e2860..c680e2860 100644
--- a/src/dialogs/ntqwizard.h
+++ b/src/dialogs/tqwizard.h
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index 4557114db..d40ec2e74 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -96,7 +96,7 @@ public:
 	Vertical
     };
 
-    // documented in qlistview.cpp
+    // documented in tqlistview.cpp
     enum SortOrder {
 	Ascending,
 	Descending
@@ -996,7 +996,7 @@ public:
         ExactMatch      = 0x00010  // 1 0000
     };
 
-    // Documented in qtabwidget.cpp
+    // Documented in tqtabwidget.cpp
     enum Corner {
 	TopLeft     = 0x00000,
 	TopRight    = 0x00001,
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index b8e8dca73..d9119ed7d 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -67,12 +67,12 @@
 #include "tqjpunicode.h"
 #include "tqtextcodec.h"
 #include "tqpixmap.h"
-#include <ntqtabbar.h>
+#include <tqtabbar.h>
 #include "tqiconset.h"
-#include "ntqbutton.h"
+#include "tqbutton.h"
 #include <tqtoolbutton.h>
 #include "tqstyle.h"
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "tqfile.h"
 #include "tqfileinfo.h"
 #include "tqurlinfo.h"
@@ -92,9 +92,9 @@
 #include <tqcache.h>
 #include <tqdropsite.h>
 #include "ntqgplugin.h"
-#include <ntqgrid.h>
+#include <tqgrid.h>
 #include "ntqrangecontrol.h"
-#include "ntqbuttongroup.h"
+#include "tqbuttongroup.h"
 #include <tqdatetimeedit.h>
 #include "ntqgvector.h"
 #include "ntqhbox.h"
@@ -131,7 +131,7 @@
 #include "tqsignal.h"
 #include <ntqmessagebox.h>
 #include "ntqmetaobject.h"
-#include "ntqheader.h"
+#include "tqheader.h"
 #include <ntqmotifplusstyle.h>
 #include <ntqcdestyle.h>
 #include <tqmovie.h>
@@ -148,7 +148,7 @@
 #include <tqpaintdevicemetrics.h>
 #include "tqpointarray.h"
 #include "tqmenudata.h"
-#include <ntqlistview.h>
+#include <tqlistview.h>
 #include "tqpen.h"
 #include "tqdragobject.h"
 #include <tqiconview.h>
@@ -162,7 +162,7 @@
 #include <ntqprintdialog.h>
 #include <tqprinter.h>
 #include <tqprocess.h>
-#include "ntqprogressbar.h"
+#include "tqprogressbar.h"
 #include <tqasciicache.h>
 #include "tqptrdict.h"
 #include <ntqcleanuphandler.h>
@@ -176,10 +176,10 @@
 #include "tqregexp.h"
 #include <tqclipboard.h>
 #include <tqhebrewcodec.h>
-#include <ntqlistbox.h>
-#include <ntqgridview.h>
+#include <tqlistbox.h>
+#include <tqgridview.h>
 #include "tqsemaphore.h"
-#include <ntqprogressdialog.h>
+#include <tqprogressdialog.h>
 #include "tqsocketdevice.h"
 #include <tqsessionmanager.h>
 #include <tqsettings.h>
@@ -210,7 +210,7 @@
 #include "tqsqlcursor.h"
 #include <tqsqldriver.h>
 #include <tqsqlform.h>
-#include "ntqtable.h"
+#include "tqtable.h"
 #include <tqsqlpropertymap.h>
 #include <tqsqldatabase.h>
 #include <tqdatabrowser.h>
@@ -226,14 +226,14 @@
 #include <tqstyleplugin.h>
 #include "tqtextedit.h"
 #include <tqsyntaxhighlighter.h>
-#include <ntqtabdialog.h>
+#include <tqtabdialog.h>
 #include "tqsqleditorfactory.h"
-#include <ntqtabwidget.h>
+#include <tqtabwidget.h>
 #include <tqtextbrowser.h>
 #include <tqbig5codec.h>
 #include <tqtextcodecfactory.h>
 #include <tqtextcodecplugin.h>
-#include <ntqmultilineedit.h>
+#include <tqmultilineedit.h>
 #include "tqtoolbar.h"
 #include <tqtextview.h>
 #include "tqwaitcondition.h"
@@ -266,7 +266,7 @@
 #include <tqwidgetstack.h>
 #include <tqcheckbox.h>
 #include <ntqcompactstyle.h>
-#include <ntqwizard.h>
+#include <tqwizard.h>
 #include <tqpainter.h>
 #include <tqworkspace.h>
 #include <tqlocalfs.h>
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index a44d10389..a409fd457 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -1336,7 +1336,7 @@ TQApplication::~TQApplication()
 	// showargs.cpp - displays program arguments in a list box
 
 	#include <ntqapplication.h>
-	#include <ntqlistbox.h>
+	#include <tqlistbox.h>
 
 	int main( int argc, char **argv )
 	{
diff --git a/src/kernel/tqstyle.cpp b/src/kernel/tqstyle.cpp
index cca9ef651..e7e36c06b 100644
--- a/src/kernel/tqstyle.cpp
+++ b/src/kernel/tqstyle.cpp
@@ -44,9 +44,9 @@
 #include "tqpainter.h"
 #include "tqbitmap.h"
 #include "tqpixmapcache.h"
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "ntqlayout.h"
-#include "ntqlistview.h"
+#include "tqlistview.h"
 #include "tqpopupmenu.h"
 #include "tqpushbutton.h"
 #include "tqobjectlist.h"
diff --git a/src/kernel/tqstyle.h b/src/kernel/tqstyle.h
index d0f3712f0..01e091ff9 100644
--- a/src/kernel/tqstyle.h
+++ b/src/kernel/tqstyle.h
@@ -45,7 +45,7 @@
 #include "tqpixmap.h"
 #include "tqcolor.h"
 #include "tqiconset.h"
-#include "ntqtabbar.h"
+#include "tqtabbar.h"
 #include "tqtoolbutton.h"
 #endif // QT_H
 
diff --git a/src/sql/tqdatatable.h b/src/sql/tqdatatable.h
index 7cf5a38f8..29f56b8ed 100644
--- a/src/sql/tqdatatable.h
+++ b/src/sql/tqdatatable.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqstring.h"
 #include "ntqvariant.h"
-#include "ntqtable.h"
+#include "tqtable.h"
 #include "tqsql.h"
 #include "tqsqlcursor.h"
 #include "tqsqlindex.h"
diff --git a/src/styles/qcdestyle.cpp b/src/styles/qcdestyle.cpp
index b258cb679..27388d3f6 100644
--- a/src/styles/qcdestyle.cpp
+++ b/src/styles/qcdestyle.cpp
@@ -44,7 +44,7 @@
 
 #include "tqpainter.h"
 #include "ntqdrawutil.h"
-#include "ntqbutton.h"
+#include "tqbutton.h"
 #include <limits.h>
 
 /*!
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 7b6e475f3..6e0d1231e 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -49,25 +49,25 @@
 #include "ntqdrawutil.h"
 #include "tqpixmap.h"
 #include "tqpushbutton.h"
-#include "ntqtabbar.h"
-#include "ntqtabwidget.h"
+#include "tqtabbar.h"
+#include "tqtabwidget.h"
 #include "tqlineedit.h"
 #include "tqscrollbar.h"
 #include "tqtoolbutton.h"
 #include "tqtoolbar.h"
 #include "tqcombobox.h"
 #include "ntqdockarea.h"
-#include "ntqheader.h"
+#include "tqheader.h"
 #include "tqspinbox.h"
 #include "ntqrangecontrol.h"
 #include "ntqgroupbox.h"
 #include "tqslider.h"
-#include "ntqlistview.h"
+#include "tqlistview.h"
 #include "tqcheckbox.h"
 #include "tqradiobutton.h"
 #include "tqbitmap.h"
-#include "ntqprogressbar.h"
-#include "ntqlistbox.h"
+#include "tqprogressbar.h"
+#include "tqlistbox.h"
 #include "private/tqdialogbuttons_p.h"
 #include <limits.h>
 #include <tqpixmap.h>
diff --git a/src/styles/qinterlacestyle.cpp b/src/styles/qinterlacestyle.cpp
index 7f4838c80..11bc57366 100644
--- a/src/styles/qinterlacestyle.cpp
+++ b/src/styles/qinterlacestyle.cpp
@@ -54,7 +54,7 @@
 #include "tqwidget.h"
 #include "ntqrangecontrol.h"
 #include "tqscrollbar.h"
-#include "ntqlistbox.h"
+#include "tqlistbox.h"
 
 #include <limits.h>
 
diff --git a/src/styles/qmotifplusstyle.cpp b/src/styles/qmotifplusstyle.cpp
index d37419b2e..a78df1928 100644
--- a/src/styles/qmotifplusstyle.cpp
+++ b/src/styles/qmotifplusstyle.cpp
@@ -46,7 +46,7 @@
 #include "ntqapplication.h"
 #include "tqpainter.h"
 #include "tqpalette.h"
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "tqpushbutton.h"
 #include "tqcheckbox.h"
 #include "tqradiobutton.h"
@@ -56,7 +56,7 @@
 #include "tqslider.h"
 #include "ntqdrawutil.h"
 #include "tqscrollbar.h"
-#include "ntqtabbar.h"
+#include "tqtabbar.h"
 #include "tqtoolbar.h"
 #include "ntqguardedptr.h"
 #include "ntqlayout.h"
diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp
index 55ff6666a..5447295e6 100644
--- a/src/styles/qmotifstyle.cpp
+++ b/src/styles/qmotifstyle.cpp
@@ -51,15 +51,15 @@
 #include "tqwidget.h"
 #include "tqpushbutton.h"
 #include "tqscrollbar.h"
-#include "ntqtabbar.h"
-#include "ntqtabwidget.h"
-#include "ntqlistview.h"
+#include "tqtabbar.h"
+#include "tqtabwidget.h"
+#include "tqlistview.h"
 #include "ntqsplitter.h"
 #include "tqslider.h"
 #include "tqcombobox.h"
 #include "ntqdockwindow.h"
 #include "ntqdockarea.h"
-#include "ntqprogressbar.h"
+#include "tqprogressbar.h"
 #include "tqimage.h"
 #include <limits.h>
 
diff --git a/src/styles/qsgistyle.cpp b/src/styles/qsgistyle.cpp
index a69ef63b6..ba510e9cb 100644
--- a/src/styles/qsgistyle.cpp
+++ b/src/styles/qsgistyle.cpp
@@ -44,7 +44,7 @@
 
 #include "tqpopupmenu.h"
 #include "ntqapplication.h"
-#include "ntqbutton.h"
+#include "tqbutton.h"
 #include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "tqpixmap.h"
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index 23754f786..1c87c1e9b 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/qwindowsstyle.cpp
@@ -52,14 +52,14 @@
 #include "tqimage.h"
 #include "tqpushbutton.h"
 #include "tqcombobox.h"
-#include "ntqlistbox.h"
+#include "tqlistbox.h"
 #include "tqwidget.h"
 #include "ntqrangecontrol.h"
 #include "tqscrollbar.h"
 #include "tqslider.h"
-#include "ntqtabwidget.h"
-#include "ntqtabbar.h"
-#include "ntqlistview.h"
+#include "tqtabwidget.h"
+#include "tqtabbar.h"
+#include "tqlistview.h"
 #include "tqbitmap.h"
 #include "ntqcleanuphandler.h"
 #include "ntqdockwindow.h"
diff --git a/src/table/qt_table.pri b/src/table/qt_table.pri
index a3c6e4b44..7a0578ed2 100644
--- a/src/table/qt_table.pri
+++ b/src/table/qt_table.pri
@@ -1,6 +1,6 @@
 # TQt table module
 
 table {
-	HEADERS += $$TABLE_H/ntqtable.h
-	SOURCES += $$TABLE_CPP/qtable.cpp
+	HEADERS += $$TABLE_H/tqtable.h
+	SOURCES += $$TABLE_CPP/tqtable.cpp
 }
diff --git a/src/table/qtable.cpp b/src/table/tqtable.cpp
index d83827a92..220d9af7c 100644
--- a/src/table/qtable.cpp
+++ b/src/table/tqtable.cpp
@@ -44,7 +44,7 @@
 #include "qplatformdefs.h"
 #endif
 
-#include "ntqtable.h"
+#include "tqtable.h"
 
 #ifndef TQT_NO_TABLE
 
@@ -59,7 +59,7 @@
 #include <tqcheckbox.h>
 #include <tqdragobject.h>
 #include <tqevent.h>
-#include <ntqlistbox.h>
+#include <tqlistbox.h>
 #include <tqstyle.h>
 #include <tqdatatable.h>
 #include <ntqvalidator.h>
@@ -488,7 +488,7 @@ int TQTableSelection::numCols() const
     this does not happen, you must call setReplaceable(FALSE)
     in the constructor of your subclass.
 
-    \img qtableitems.png Table Items
+    \img tqtableitems.png Table Items
 
     \sa TQCheckTableItem TQComboTableItem
 
@@ -1194,7 +1194,7 @@ bool TQTableItem::isEnabled() const
     \l{TQCheckTableItem}s using their Run Time Type Identification
     number (see rtti()).
 
-    \img qtableitems.png Table Items
+    \img tqtableitems.png Table Items
 
     \sa TQCheckTableItem TQTableItem TQComboBox
 */
@@ -1496,7 +1496,7 @@ TQSize TQComboTableItem::sizeHint() const
     \l{TQComboTableItem}s using their Run Time Type Identification
     (rtti) value.
 
-    \img qtableitems.png Table Items
+    \img tqtableitems.png Table Items
 
     \sa rtti() EditType TQComboTableItem TQTableItem TQCheckBox
 */
@@ -1698,7 +1698,7 @@ TQSize TQCheckTableItem::sizeHint() const
     the \e viewport; (see \link tqscrollview.html#allviews
     TQScrollView\endlink).
 
-    \img qtableitems.png Table Items
+    \img tqtableitems.png Table Items
 
     \target headers
     \section1 Headers
@@ -1760,7 +1760,7 @@ TQSize TQCheckTableItem::sizeHint() const
     property of individual rows and columns with setRowReadOnly() and
     setColumnReadOnly(). (Whether a cell is editable or read-only
     depends on these settings and the cell's \link
-    qtableitem.html#wheneditable TQTableItem::EditType\endlink.)
+    tqtableitem.html#wheneditable TQTableItem::EditType\endlink.)
 
     The row and column which have the focus are returned by
     currentRow() and currentColumn() respectively.
@@ -1811,7 +1811,7 @@ TQSize TQCheckTableItem::sizeHint() const
     In-place editing of the text in TQTableItems, and the values in
     TQComboTableItems and TQCheckTableItems works automatically. Cells
     may be editable or read-only, see \link
-    qtableitem.html#wheneditable TQTableItem::EditType\endlink. If you
+    tqtableitem.html#wheneditable TQTableItem::EditType\endlink. If you
     want fine control over editing see beginEdit() and endEdit().
 
     The contents of a cell can be retrieved as a TQTableItem using
@@ -2196,7 +2196,7 @@ void TQTable::setReadOnly( bool b )
 
     Whether a cell in this row is editable or read-only depends on the
     cell's EditType, and this setting:
-    see \link qtableitem.html#wheneditable TQTableItem::EditType\endlink.
+    see \link tqtableitem.html#wheneditable TQTableItem::EditType\endlink.
 
     \sa isRowReadOnly() setColumnReadOnly() setReadOnly()
 */
@@ -2225,7 +2225,7 @@ void TQTable::setRowReadOnly( int row, bool ro )
 
     Whether a cell in this column is editable or read-only depends on
     the cell's EditType, and this setting:
-    see \link qtableitem.html#wheneditable TQTableItem::EditType\endlink.
+    see \link tqtableitem.html#wheneditable TQTableItem::EditType\endlink.
 
     \sa isColumnReadOnly() setRowReadOnly() setReadOnly()
 
@@ -2255,7 +2255,7 @@ void TQTable::setColumnReadOnly( int col, bool ro )
 
     Whether a cell in the table is editable or read-only depends on
     the cell's \link TQTableItem::EditType EditType\endlink, and this setting:
-    see \link qtableitem.html#wheneditable
+    see \link tqtableitem.html#wheneditable
     TQTableItem::EditType\endlink.
 
     \sa TQWidget::enabled setColumnReadOnly() setRowReadOnly()
@@ -2271,7 +2271,7 @@ bool TQTable::isReadOnly() const
 
     Whether a cell in this row is editable or read-only depends on the
     cell's \link TQTableItem::EditType EditType\endlink, and this
-    setting: see \link qtableitem.html#wheneditable
+    setting: see \link tqtableitem.html#wheneditable
     TQTableItem::EditType\endlink.
 
     \sa setRowReadOnly() isColumnReadOnly()
@@ -2288,7 +2288,7 @@ bool TQTable::isRowReadOnly( int row ) const
 
     Whether a cell in this column is editable or read-only depends on
     the cell's EditType, and this setting: see \link
-    qtableitem.html#wheneditable TQTableItem::EditType\endlink.
+    tqtableitem.html#wheneditable TQTableItem::EditType\endlink.
 
     \sa setColumnReadOnly() isRowReadOnly()
 */
@@ -7286,7 +7286,7 @@ bool TQTableHeader::isSectionStretchable( int s ) const
 
 void TQTableHeader::swapSections( int oldIdx, int newIdx, bool swapTable )
 {
-    extern bool tqt_qheader_label_return_null_strings; // qheader.cpp
+    extern bool tqt_qheader_label_return_null_strings; // tqheader.cpp
     tqt_qheader_label_return_null_strings = TRUE;
 
     TQIconSet oldIconSet, newIconSet;
@@ -7361,6 +7361,6 @@ void TQTableHeader::setLabels(const TQStringList & labels)
     }
 }
 
-#include "qtable.moc"
+#include "tqtable.moc"
 
 #endif // TQT_NO_TABLE
diff --git a/src/table/ntqtable.h b/src/table/tqtable.h
index baeb8bd82..f952a4d78 100644
--- a/src/table/ntqtable.h
+++ b/src/table/tqtable.h
@@ -45,7 +45,7 @@
 #include "tqscrollview.h"
 #include "tqpixmap.h"
 #include "tqptrvector.h"
-#include "ntqheader.h"
+#include "tqheader.h"
 #include "tqmemarray.h"
 #include "tqptrlist.h"
 #include "ntqguardedptr.h"
diff --git a/src/tools/ntqwinexport.h b/src/tools/ntqwinexport.h
index d2e5e58a3..2f4c41f13 100644
--- a/src/tools/ntqwinexport.h
+++ b/src/tools/ntqwinexport.h
@@ -197,7 +197,7 @@ TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQPtrListIterator< T
 TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQPtrList< TQCanvasView >;
 #endif
 
-// qtable template exports
+// tqtable template exports
 #if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QTABLE_SELECTION) && !defined(Q_EXPORTED_QTABLESELECTION_TEMPLATES)
 #define Q_EXPORTED_QTABLESELECTION_TEMPLATES
 TQM_TEMPLATE_EXTERN_TABLE template class TQM_EXPORT_TABLE TQPtrList<TQTableSelection>;
diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt
index c13fc7bd2..598e45d46 100644
--- a/src/tools/qfeatures.txt
+++ b/src/tools/qfeatures.txt
@@ -38,7 +38,7 @@ SeeAlso: ???
 Feature: TABLE
 Section: Widgets
 Requires: COMBOBOX HEADER CHECKBOX
-Name: QTable
+Name: TQTable
 SeeAlso: ???
 
 Feature: XML
@@ -765,7 +765,7 @@ SeeAlso: ???
 Feature: GRIDVIEW
 Section: Widgets
 Requires: SCROLLVIEW
-Name: QGridView
+Name: TQGridView
 SeeAlso: ???
 
 Feature: TEXTVIEW
@@ -874,7 +874,7 @@ SeeAlso: ???
 Feature: LISTBOX
 Section: Widgets
 Requires: SCROLLVIEW STRINGLIST
-Name: QListBox
+Name: TQListBox
 SeeAlso: ???
 
 Feature: ACCEL
@@ -892,7 +892,7 @@ SeeAlso: ???
 Feature: HEADER
 Section: Widgets
 Requires: STYLE ICONSET
-Name: QHeader
+Name: TQHeader
 SeeAlso: ???
 
 Feature: TITLEBAR
@@ -922,7 +922,7 @@ SeeAlso: ???
 Feature: LISTVIEW
 Section: Widgets
 Requires: SCROLLVIEW HEADER LINEEDIT
-Name: QListView
+Name: TQListView
 SeeAlso: ???
 
 Feature: STYLE_WINDOWS
@@ -994,13 +994,13 @@ SeeAlso: ???
 Feature: TABDIALOG
 Section: Widgets
 Requires: DIALOG PUSHBUTTON LAYOUT TABWIDGET
-Name: QTabDialog
+Name: TQTabDialog
 SeeAlso: ???
 
 Feature: WIZARD
 Section: Widgets
 Requires: DIALOG WIDGETSTACK PUSHBUTTON LAYOUT LABEL
-Name: QWizard
+Name: TQWizard
 SeeAlso: ???
 
 Feature: FILEDIALOG
@@ -1024,7 +1024,7 @@ SeeAlso: ???
 Feature: PROGRESSDIALOG
 Section: Widgets
 Requires: DIALOG LABEL PUSHBUTTON PROGRESSBAR
-Name: QProgressDialog
+Name: TQProgressDialog
 SeeAlso: ???
 
 Feature: INPUTDIALOG
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index 3356c5b67..ca5bccb72 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/qwinexport.cpp
@@ -12,7 +12,7 @@
 #include <tqhttp.h>
 #include <private/tqsqlextension_p.h>
 #include <tqsqlindex.h>
-#include <ntqtable.h>
+#include <tqtable.h>
 #include <tqasciidict.h>
 #include <tqcstring.h>
 #include <tqdict.h>
diff --git a/src/widgets/ntqdockwindow.h b/src/widgets/ntqdockwindow.h
index 51d8ab456..ad5fa47e7 100644
--- a/src/widgets/ntqdockwindow.h
+++ b/src/widgets/ntqdockwindow.h
@@ -42,7 +42,7 @@
 #define TQDOCKWINDOW_H
 
 #ifndef QT_H
-#include "ntqframe.h"
+#include "tqframe.h"
 #endif // QT_H
 
 #ifndef TQT_NO_MAINWINDOW
diff --git a/src/widgets/ntqgroupbox.h b/src/widgets/ntqgroupbox.h
index 5a33f1329..14198de3e 100644
--- a/src/widgets/ntqgroupbox.h
+++ b/src/widgets/ntqgroupbox.h
@@ -42,7 +42,7 @@
 #define TQGROUPBOX_H
 
 #ifndef QT_H
-#include "ntqframe.h"
+#include "tqframe.h"
 #endif // QT_H
 
 #ifndef TQT_NO_GROUPBOX
diff --git a/src/widgets/ntqhbox.h b/src/widgets/ntqhbox.h
index f92379514..fec6a33cd 100644
--- a/src/widgets/ntqhbox.h
+++ b/src/widgets/ntqhbox.h
@@ -44,7 +44,7 @@
 
 #ifndef TQT_NO_HBOX
 
-#include "ntqframe.h"
+#include "tqframe.h"
 
 class TQBoxLayout;
 
diff --git a/src/widgets/ntqhbuttongroup.h b/src/widgets/ntqhbuttongroup.h
index b101a4c6b..ab53a0824 100644
--- a/src/widgets/ntqhbuttongroup.h
+++ b/src/widgets/ntqhbuttongroup.h
@@ -42,7 +42,7 @@
 #define TQHBUTTONGROUP_H
 
 #ifndef QT_H
-#include "ntqbuttongroup.h"
+#include "tqbuttongroup.h"
 #endif // QT_H
 
 #ifndef TQT_NO_HBUTTONGROUP
diff --git a/src/widgets/ntqrangecontrol.h b/src/widgets/ntqrangecontrol.h
index 46072b589..0afb75ed8 100644
--- a/src/widgets/ntqrangecontrol.h
+++ b/src/widgets/ntqrangecontrol.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqglobal.h"
-#include "ntqframe.h"
+#include "tqframe.h"
 #endif // QT_H
 
 #ifndef TQT_NO_RANGECONTROL
diff --git a/src/widgets/ntqsplitter.h b/src/widgets/ntqsplitter.h
index 425b9718f..bd8aef13e 100644
--- a/src/widgets/ntqsplitter.h
+++ b/src/widgets/ntqsplitter.h
@@ -42,7 +42,7 @@
 #define TQSPLITTER_H
 
 #ifndef QT_H
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "tqvaluelist.h"
 #endif // QT_H
 
diff --git a/src/widgets/ntqvbuttongroup.h b/src/widgets/ntqvbuttongroup.h
index 605b69a04..a8050bc76 100644
--- a/src/widgets/ntqvbuttongroup.h
+++ b/src/widgets/ntqvbuttongroup.h
@@ -42,7 +42,7 @@
 #define TQVBUTTONGROUP_H
 
 #ifndef QT_H
-#include "ntqbuttongroup.h"
+#include "tqbuttongroup.h"
 #endif // QT_H
 
 #ifndef TQT_NO_VBUTTONGROUP
diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/qgroupbox.cpp
index f37b5f6d7..906af0f6f 100644
--- a/src/widgets/qgroupbox.cpp
+++ b/src/widgets/qgroupbox.cpp
@@ -51,7 +51,7 @@
 #include "ntqapplication.h"
 #include "tqstyle.h"
 #include "tqcheckbox.h"
-#include "ntqbuttongroup.h"
+#include "tqbuttongroup.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 #include "ntqaccessible.h"
 #endif
diff --git a/src/widgets/qhbuttongroup.cpp b/src/widgets/qhbuttongroup.cpp
index 62027f691..4b5dbf0fc 100644
--- a/src/widgets/qhbuttongroup.cpp
+++ b/src/widgets/qhbuttongroup.cpp
@@ -56,7 +56,7 @@
     designed for buttons. From a functionality point of view it is a
     TQButtonGroup.
 
-    \img qbuttongroup-h.png TQButtonGroup
+    \img tqbuttongroup-h.png TQButtonGroup
 
     \sa TQVButtonGroup
 */
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index 72cfdba84..19cf6d377 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -3,8 +3,8 @@
 widgets {
 	WIDGETS_P	= widgets
 
-	HEADERS += $$WIDGETS_H/ntqbuttongroup.h \
-		  $$WIDGETS_H/ntqbutton.h \
+	HEADERS += $$WIDGETS_H/tqbuttongroup.h \
+		  $$WIDGETS_H/tqbutton.h \
 		  $$WIDGETS_P/tqdialogbuttons_p.h \
 		  $$WIDGETS_H/tqcheckbox.h \
 		  $$WIDGETS_H/tqcombobox.h \
@@ -12,26 +12,26 @@ widgets {
 		  $$WIDGETS_H/tqdial.h \
 		  $$WIDGETS_H/ntqdockarea.h \
 		  $$WIDGETS_H/ntqdockwindow.h \
-		  $$WIDGETS_H/ntqframe.h \
-		  $$WIDGETS_H/ntqgrid.h \
-		  $$WIDGETS_H/ntqgridview.h \
+		  $$WIDGETS_H/tqframe.h \
+		  $$WIDGETS_H/tqgrid.h \
+		  $$WIDGETS_H/tqgridview.h \
 		  $$WIDGETS_H/ntqgroupbox.h \
 		  $$WIDGETS_H/ntqhbuttongroup.h \
-		  $$WIDGETS_H/ntqheader.h \
+		  $$WIDGETS_H/tqheader.h \
 		  $$WIDGETS_H/ntqhgroupbox.h \
 		  $$WIDGETS_H/ntqhbox.h \
 		  $$WIDGETS_H/tqiconview.h \
 		  $$WIDGETS_H/tqlabel.h \
 		  $$WIDGETS_H/tqlcdnumber.h \
 		  $$WIDGETS_H/tqlineedit.h \
-		  $$WIDGETS_H/ntqlistbox.h \
-		  $$WIDGETS_H/ntqlistview.h \
+		  $$WIDGETS_H/tqlistbox.h \
+		  $$WIDGETS_H/tqlistview.h \
 		  $$WIDGETS_H/tqmainwindow.h \
 		  $$WIDGETS_H/tqmenubar.h \
 		  $$WIDGETS_H/tqmenudata.h \
-		  $$WIDGETS_H/ntqmultilineedit.h \
+		  $$WIDGETS_H/tqmultilineedit.h \
 		  $$WIDGETS_H/tqpopupmenu.h \
-		  $$WIDGETS_H/ntqprogressbar.h \
+		  $$WIDGETS_H/tqprogressbar.h \
 		  $$WIDGETS_H/tqpushbutton.h \
 		  $$WIDGETS_H/tqradiobutton.h \
 		  $$WIDGETS_H/ntqrangecontrol.h \
@@ -42,10 +42,10 @@ widgets {
 		  $$WIDGETS_H/tqspinbox.h \
 		  $$WIDGETS_H/ntqsplitter.h \
 		  $$WIDGETS_H/tqstatusbar.h \
-		  $$WIDGETS_H/ntqtabbar.h \
+		  $$WIDGETS_H/tqtabbar.h \
 		  $$WIDGETS_H/tqsyntaxhighlighter.h \
 		  $$WIDGETS_P/tqsyntaxhighlighter_p.h \
-		  $$WIDGETS_H/ntqtabwidget.h \
+		  $$WIDGETS_H/tqtabwidget.h \
 		  $$WIDGETS_P/qtitlebar_p.h \
 		  $$WIDGETS_H/tqtoolbar.h \
 		  $$WIDGETS_H/tqtoolbox.h \
@@ -65,8 +65,8 @@ widgets {
 		  $$WIDGETS_P/tqwidgetinterface_p.h \
 		  $$WIDGETS_H/tqwidgetplugin.h
 
-	SOURCES += $$WIDGETS_CPP/qbuttongroup.cpp \
-		  $$WIDGETS_CPP/qbutton.cpp \
+	SOURCES += $$WIDGETS_CPP/tqbuttongroup.cpp \
+		  $$WIDGETS_CPP/tqbutton.cpp \
 		  $$WIDGETS_CPP/tqdialogbuttons.cpp \
 		  $$WIDGETS_CPP/tqcheckbox.cpp \
 		  $$WIDGETS_CPP/tqcombobox.cpp \
@@ -74,26 +74,26 @@ widgets {
 		  $$WIDGETS_CPP/tqdial.cpp \
 		  $$WIDGETS_CPP/qdockarea.cpp \
 		  $$WIDGETS_CPP/qdockwindow.cpp \
-		  $$WIDGETS_CPP/qframe.cpp \
-		  $$WIDGETS_CPP/qgrid.cpp \
-		  $$WIDGETS_CPP/qgridview.cpp \
+		  $$WIDGETS_CPP/tqframe.cpp \
+		  $$WIDGETS_CPP/tqgrid.cpp \
+		  $$WIDGETS_CPP/tqgridview.cpp \
 		  $$WIDGETS_CPP/qgroupbox.cpp \
 		  $$WIDGETS_CPP/qhbuttongroup.cpp \
-		  $$WIDGETS_CPP/qheader.cpp \
+		  $$WIDGETS_CPP/tqheader.cpp \
 		  $$WIDGETS_CPP/qhgroupbox.cpp \
 		  $$WIDGETS_CPP/qhbox.cpp \
 		  $$WIDGETS_CPP/tqiconview.cpp \
 		  $$WIDGETS_CPP/tqlabel.cpp \
 		  $$WIDGETS_CPP/tqlcdnumber.cpp \
 		  $$WIDGETS_CPP/tqlineedit.cpp \
-		  $$WIDGETS_CPP/qlistbox.cpp \
-		  $$WIDGETS_CPP/qlistview.cpp \
+		  $$WIDGETS_CPP/tqlistbox.cpp \
+		  $$WIDGETS_CPP/tqlistview.cpp \
 		  $$WIDGETS_CPP/tqmainwindow.cpp \
 		  $$WIDGETS_CPP/tqmenubar.cpp \
 		  $$WIDGETS_CPP/tqmenudata.cpp \
-		  $$WIDGETS_CPP/qmultilineedit.cpp \
+		  $$WIDGETS_CPP/tqmultilineedit.cpp \
 		  $$WIDGETS_CPP/tqpopupmenu.cpp \
-		  $$WIDGETS_CPP/qprogressbar.cpp \
+		  $$WIDGETS_CPP/tqprogressbar.cpp \
 		  $$WIDGETS_CPP/tqpushbutton.cpp \
 		  $$WIDGETS_CPP/tqradiobutton.cpp \
 		  $$WIDGETS_CPP/qrangecontrol.cpp \
@@ -106,8 +106,8 @@ widgets {
 		  $$WIDGETS_CPP/qsplitter.cpp \
 		  $$WIDGETS_CPP/tqstatusbar.cpp \
 		  $$WIDGETS_CPP/tqsyntaxhighlighter.cpp \
-		  $$WIDGETS_CPP/qtabbar.cpp \
-		  $$WIDGETS_CPP/qtabwidget.cpp \
+		  $$WIDGETS_CPP/tqtabbar.cpp \
+		  $$WIDGETS_CPP/tqtabwidget.cpp \
 		  $$WIDGETS_CPP/qtitlebar.cpp \
 		  $$WIDGETS_CPP/tqtoolbar.cpp \
 		  $$WIDGETS_CPP/tqtoolbox.cpp \
diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h
index ae9fd6b15..0a22bd885 100644
--- a/src/widgets/qtitlebar_p.h
+++ b/src/widgets/qtitlebar_p.h
@@ -56,7 +56,7 @@
 
 
 #ifndef QT_H
-#include "ntqbutton.h"
+#include "tqbutton.h"
 #include "tqlabel.h"
 #endif // QT_H
 
diff --git a/src/widgets/qvbuttongroup.cpp b/src/widgets/qvbuttongroup.cpp
index 206d7cd75..06658c18d 100644
--- a/src/widgets/qvbuttongroup.cpp
+++ b/src/widgets/qvbuttongroup.cpp
@@ -54,7 +54,7 @@
   of TQButtonGroup. Think of it as a TQVBox that offers a frame with a
   title and is specifically designed for buttons.
 
-  \img qbuttongroup-v.png TQButtonGroup
+  \img tqbuttongroup-v.png TQButtonGroup
 
   \sa TQHButtonGroup
 */
diff --git a/src/widgets/qbutton.cpp b/src/widgets/tqbutton.cpp
index 8446c7f46..e29ae1546 100644
--- a/src/widgets/qbutton.cpp
+++ b/src/widgets/tqbutton.cpp
@@ -38,9 +38,9 @@
 **
 **********************************************************************/
 
-#include "ntqbutton.h"
+#include "tqbutton.h"
 #ifndef TQT_NO_BUTTON
-#include "ntqbuttongroup.h"
+#include "tqbuttongroup.h"
 #include "tqbitmap.h"
 #include "tqpainter.h"
 #include "tqtimer.h"
@@ -126,7 +126,7 @@ TQTimer *TQButton::timer()
 
 
 /*!
-    \class TQButton ntqbutton.h
+    \class TQButton tqbutton.h
     \brief The TQButton class is the abstract base class of button
     widgets, providing functionality common to buttons.
 
diff --git a/src/widgets/ntqbutton.h b/src/widgets/tqbutton.h
index 5683e44b7..5683e44b7 100644
--- a/src/widgets/ntqbutton.h
+++ b/src/widgets/tqbutton.h
diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/tqbuttongroup.cpp
index 08c1919a7..c56af49d9 100644
--- a/src/widgets/qbuttongroup.cpp
+++ b/src/widgets/tqbuttongroup.cpp
@@ -38,9 +38,9 @@
 **
 **********************************************************************/
 
-#include "ntqbuttongroup.h"
+#include "tqbuttongroup.h"
 #ifndef TQT_NO_BUTTONGROUP
-#include "ntqbutton.h"
+#include "tqbutton.h"
 #include "tqptrlist.h"
 #include "ntqapplication.h"
 #include "tqradiobutton.h"
@@ -48,7 +48,7 @@
 
 
 /*!
-    \class TQButtonGroup ntqbuttongroup.h
+    \class TQButtonGroup tqbuttongroup.h
     \brief The TQButtonGroup widget organizes TQButton widgets in a group.
 
     \ingroup organizers
diff --git a/src/widgets/ntqbuttongroup.h b/src/widgets/tqbuttongroup.h
index 1eff32887..1eff32887 100644
--- a/src/widgets/ntqbuttongroup.h
+++ b/src/widgets/tqbuttongroup.h
diff --git a/src/widgets/tqcheckbox.h b/src/widgets/tqcheckbox.h
index 4a63e4b4a..1e7acc2df 100644
--- a/src/widgets/tqcheckbox.h
+++ b/src/widgets/tqcheckbox.h
@@ -42,7 +42,7 @@
 #define TQCHECKBOX_H
 
 #ifndef QT_H
-#include "ntqbutton.h"
+#include "tqbutton.h"
 #endif // QT_H
 
 #ifndef TQT_NO_CHECKBOX
diff --git a/src/widgets/tqcombobox.cpp b/src/widgets/tqcombobox.cpp
index 9914c4398..4d315b848 100644
--- a/src/widgets/tqcombobox.cpp
+++ b/src/widgets/tqcombobox.cpp
@@ -41,7 +41,7 @@
 #include "tqcombobox.h"
 #ifndef TQT_NO_COMBOBOX
 #include "tqpopupmenu.h"
-#include "ntqlistbox.h"
+#include "tqlistbox.h"
 #include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "tqstrlist.h"
diff --git a/src/widgets/qframe.cpp b/src/widgets/tqframe.cpp
index c07820400..4966a1329 100644
--- a/src/widgets/qframe.cpp
+++ b/src/widgets/tqframe.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqframe.h"
+#include "tqframe.h"
 #ifndef TQT_NO_FRAME
 #include "tqpainter.h"
 #include "ntqdrawutil.h"
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "tqbitmap.h"
 #include "tqstyle.h"
 
diff --git a/src/widgets/ntqframe.h b/src/widgets/tqframe.h
index db565f474..db565f474 100644
--- a/src/widgets/ntqframe.h
+++ b/src/widgets/tqframe.h
diff --git a/src/widgets/qgrid.cpp b/src/widgets/tqgrid.cpp
index 7e4cc5895..0fe3f6949 100644
--- a/src/widgets/qgrid.cpp
+++ b/src/widgets/tqgrid.cpp
@@ -35,13 +35,13 @@
 **********************************************************************/
 
 
-#include "ntqgrid.h"
+#include "tqgrid.h"
 #ifndef TQT_NO_GRID
 #include "ntqlayout.h"
 #include "ntqapplication.h"
 
 /*!
-    \class TQGrid ntqgrid.h
+    \class TQGrid tqgrid.h
     \brief The TQGrid widget provides simple geometry management of its children.
 
     \ingroup geomanagement
@@ -57,7 +57,7 @@
     Use setMargin() to add space around the grid itself, and
     setSpacing() to add space between the widgets.
 
-    \img qgrid-m.png TQGrid
+    \img tqgrid-m.png TQGrid
 
     \sa TQVBox TQHBox TQGridLayout
 */
diff --git a/src/widgets/ntqgrid.h b/src/widgets/tqgrid.h
index 8fd72e4d6..991a765e9 100644
--- a/src/widgets/ntqgrid.h
+++ b/src/widgets/tqgrid.h
@@ -38,7 +38,7 @@
 #define TQGRID_H
 
 #ifndef QT_H
-#include "ntqframe.h"
+#include "tqframe.h"
 #endif // QT_H
 
 #ifndef TQT_NO_GRID
diff --git a/src/widgets/qgridview.cpp b/src/widgets/tqgridview.cpp
index 7210a4d81..7598ffb26 100644
--- a/src/widgets/qgridview.cpp
+++ b/src/widgets/tqgridview.cpp
@@ -39,14 +39,14 @@
 **********************************************************************/
 
 
-#include "ntqgridview.h"
+#include "tqgridview.h"
 
 #ifndef TQT_NO_GRIDVIEW
 
 #include "tqpainter.h"
 
 /*!
-    \class TQGridView ntqgridview.h
+    \class TQGridView tqgridview.h
     \brief The TQGridView class provides an abstract base for
     fixed-size grids.
 
diff --git a/src/widgets/ntqgridview.h b/src/widgets/tqgridview.h
index 1ec47a823..1ec47a823 100644
--- a/src/widgets/ntqgridview.h
+++ b/src/widgets/tqgridview.h
diff --git a/src/widgets/qheader.cpp b/src/widgets/tqheader.cpp
index 54d39ae35..7daa266c7 100644
--- a/src/widgets/qheader.cpp
+++ b/src/widgets/tqheader.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqheader.h"
+#include "tqheader.h"
 #ifndef TQT_NO_HEADER
 #include "tqpainter.h"
 #include "ntqdrawutil.h"
@@ -136,7 +136,7 @@ public:
 
 
 /*!
-    \class TQHeader ntqheader.h
+    \class TQHeader tqheader.h
     \brief The TQHeader class provides a header row or column, e.g. for
     tables and listviews.
 
@@ -209,7 +209,7 @@ public:
     the resizing is finished), use setTracking(). If the user moves a
     section the indexChange() signal is emitted.
 
-    <img src=qheader-m.png> <img src=qheader-w.png>
+    <img src=tqheader-m.png> <img src=tqheader-w.png>
 
     \sa TQListView TQTable
 */
diff --git a/src/widgets/ntqheader.h b/src/widgets/tqheader.h
index d51a8e18f..d51a8e18f 100644
--- a/src/widgets/ntqheader.h
+++ b/src/widgets/tqheader.h
diff --git a/src/widgets/tqlabel.h b/src/widgets/tqlabel.h
index f8d728807..e859245d2 100644
--- a/src/widgets/tqlabel.h
+++ b/src/widgets/tqlabel.h
@@ -42,7 +42,7 @@
 #define TQLABEL_H
 
 #ifndef QT_H
-#include "ntqframe.h"
+#include "tqframe.h"
 #endif // QT_H
 
 #ifndef TQT_NO_LABEL
diff --git a/src/widgets/tqlcdnumber.h b/src/widgets/tqlcdnumber.h
index e74de7cb6..83b92a0e0 100644
--- a/src/widgets/tqlcdnumber.h
+++ b/src/widgets/tqlcdnumber.h
@@ -42,7 +42,7 @@
 #define TQLCDNUMBER_H
 
 #ifndef QT_H
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "tqbitarray.h"
 #endif // QT_H
 
diff --git a/src/widgets/tqlineedit.h b/src/widgets/tqlineedit.h
index f5bf18c68..38b1481c7 100644
--- a/src/widgets/tqlineedit.h
+++ b/src/widgets/tqlineedit.h
@@ -47,7 +47,7 @@ class TQValidator;
 class TQPopupMenu;
 
 #ifndef QT_H
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "tqstring.h"
 #endif // QT_H
 
diff --git a/src/widgets/qlistbox.cpp b/src/widgets/tqlistbox.cpp
index ba0cd7b2a..96aa747c1 100644
--- a/src/widgets/qlistbox.cpp
+++ b/src/widgets/tqlistbox.cpp
@@ -44,7 +44,7 @@
 #include "qplatformdefs.h"
 #endif
 
-#include "ntqlistbox.h"
+#include "tqlistbox.h"
 #ifndef TQT_NO_LISTBOX
 #include "tqmemarray.h"
 #include "tqfontmetrics.h"
@@ -161,7 +161,7 @@ TQListBoxPrivate::~TQListBoxPrivate()
 
 
 /*!
-    \class TQListBoxItem ntqlistbox.h
+    \class TQListBoxItem tqlistbox.h
     \brief The TQListBoxItem class is the base class of all list box items.
 
     This class is an abstract base class used for all list box items.
@@ -525,7 +525,7 @@ bool TQListBoxItem::isSelectable() const
 
 
 /*!
-    \class TQListBoxText ntqlistbox.h
+    \class TQListBoxText tqlistbox.h
     \brief The TQListBoxText class provides list box items that display text.
 
     \ingroup advanced
@@ -635,7 +635,7 @@ int TQListBoxText::rtti() const
 }
 
 /*!
-    \class TQListBoxPixmap ntqlistbox.h
+    \class TQListBoxPixmap tqlistbox.h
     \brief The TQListBoxPixmap class provides list box items with a
     pixmap and optional text.
 
@@ -806,7 +806,7 @@ int TQListBoxPixmap::rtti() const
 }
 
 /*!
-    \class TQListBox ntqlistbox.h
+    \class TQListBox tqlistbox.h
     \brief The TQListBox widget provides a list of selectable, read-only items.
 
     \ingroup advanced
@@ -905,7 +905,7 @@ int TQListBoxPixmap::rtti() const
     \warning The list box assumes ownership of all list box items and
     will delete them when it does not need them any more.
 
-    <img src=qlistbox-m.png> <img src=qlistbox-w.png>
+    <img src=tqlistbox-m.png> <img src=tqlistbox-w.png>
 
     \sa TQListView TQComboBox TQButtonGroup
     \link guibooks.html#fowler GUI Design Handbook: List Box (two
diff --git a/src/widgets/ntqlistbox.h b/src/widgets/tqlistbox.h
index cfc2b7682..cfc2b7682 100644
--- a/src/widgets/ntqlistbox.h
+++ b/src/widgets/tqlistbox.h
diff --git a/src/widgets/qlistview.cpp b/src/widgets/tqlistview.cpp
index 5c00bca11..d5b083520 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/tqlistview.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "ntqlistview.h"
+#include "tqlistview.h"
 #ifndef TQT_NO_LISTVIEW
 #include "tqtimer.h"
-#include "ntqheader.h"
+#include "tqheader.h"
 #include "tqpainter.h"
 #include "ntqcursor.h"
 #include "tqptrstack.h"
@@ -479,7 +479,7 @@ static TQString qEllipsisText( const TQString &org, const TQFontMetrics &fm, int
     directory aren't inserted into the tree until they're actually
     needed.
 
-    \img qlistviewitems.png List View Items
+    \img tqlistviewitems.png List View Items
 
     \sa TQCheckListItem TQListView
 */
@@ -2594,7 +2594,7 @@ void TQListViewItem::ignoreDoubleClick()
     \warning The list view assumes ownership of all list view items
     and will delete them when it does not need them any more.
 
-    <img src=qlistview-m.png> <img src=qlistview-w.png>
+    <img src=tqlistview-m.png> <img src=tqlistview-w.png>
 
     \sa TQListViewItem TQCheckListItem
 */
@@ -6037,7 +6037,7 @@ struct TQCheckListItemPrivate
     The item can be checked or unchecked with setOn(). Its type can be
     retrieved with type() and its text retrieved with text().
 
-    \img qlistviewitems.png List View Items
+    \img tqlistviewitems.png List View Items
 
     \sa TQListViewItem TQListView
 */
diff --git a/src/widgets/ntqlistview.h b/src/widgets/tqlistview.h
index 45eb89a8e..29e2c629e 100644
--- a/src/widgets/ntqlistview.h
+++ b/src/widgets/tqlistview.h
@@ -476,7 +476,7 @@ public:
 		Controller,
 		RadioButtonController=Controller,
 		CheckBoxController };
-    // ### should be integrated with qbutton in ver4 perhaps
+    // ### should be integrated with tqbutton in ver4 perhaps
     enum ToggleState { Off, NoChange, On };
 
     TQCheckListItem( TQCheckListItem *parent, const TQString &text,
diff --git a/src/widgets/tqmenubar.h b/src/widgets/tqmenubar.h
index 24d425452..4c843790d 100644
--- a/src/widgets/tqmenubar.h
+++ b/src/widgets/tqmenubar.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqpopupmenu.h" // ### remove or keep for users' convenience?
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "tqmenudata.h"
 #endif // QT_H
 
diff --git a/src/widgets/qmultilineedit.cpp b/src/widgets/tqmultilineedit.cpp
index bd8ffd8cd..8ef23e266 100644
--- a/src/widgets/qmultilineedit.cpp
+++ b/src/widgets/tqmultilineedit.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqmultilineedit.h"
+#include "tqmultilineedit.h"
 #ifndef TQT_NO_MULTILINEEDIT
 #include "tqpainter.h"
 #include "tqscrollbar.h"
@@ -55,7 +55,7 @@
 
 
 /*!
-  \class TQMultiLineEdit ntqmultilineedit.h
+  \class TQMultiLineEdit tqmultilineedit.h
   \obsolete
 
   \brief The TQMultiLineEdit widget is a simple editor for inputting text.
diff --git a/src/widgets/ntqmultilineedit.h b/src/widgets/tqmultilineedit.h
index 1f53dc38f..1f53dc38f 100644
--- a/src/widgets/ntqmultilineedit.h
+++ b/src/widgets/tqmultilineedit.h
diff --git a/src/widgets/tqpopupmenu.h b/src/widgets/tqpopupmenu.h
index 49c3f37e1..e3b7079a1 100644
--- a/src/widgets/tqpopupmenu.h
+++ b/src/widgets/tqpopupmenu.h
@@ -42,7 +42,7 @@
 #define TQPOPUPMENU_H
 
 #ifndef QT_H
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "tqmenudata.h"
 #endif // QT_H
 
diff --git a/src/widgets/qprogressbar.cpp b/src/widgets/tqprogressbar.cpp
index b480ceb43..fb51aa9c3 100644
--- a/src/widgets/qprogressbar.cpp
+++ b/src/widgets/tqprogressbar.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqprogressbar.h"
+#include "tqprogressbar.h"
 #ifndef TQT_NO_PROGRESSBAR
 #include "tqpainter.h"
 #include "ntqdrawutil.h"
@@ -60,7 +60,7 @@ class TQProgressBarPrivate
 };
 
 /*!
-    \class TQProgressBar ntqprogressbar.h
+    \class TQProgressBar tqprogressbar.h
     \brief The TQProgressBar widget provides a horizontal progress bar.
 
     \ingroup advanced
diff --git a/src/widgets/ntqprogressbar.h b/src/widgets/tqprogressbar.h
index c84b8d852..a93756ab4 100644
--- a/src/widgets/ntqprogressbar.h
+++ b/src/widgets/tqprogressbar.h
@@ -42,7 +42,7 @@
 #define TQPROGRESSBAR_H
 
 #ifndef QT_H
-#include "ntqframe.h"
+#include "tqframe.h"
 #endif // QT_H
 
 #ifndef TQT_NO_PROGRESSBAR
diff --git a/src/widgets/tqpushbutton.h b/src/widgets/tqpushbutton.h
index 13b76e9fe..6712ce111 100644
--- a/src/widgets/tqpushbutton.h
+++ b/src/widgets/tqpushbutton.h
@@ -42,7 +42,7 @@
 #define TQPUSHBUTTON_H
 
 #ifndef QT_H
-#include "ntqbutton.h"
+#include "tqbutton.h"
 #include "tqiconset.h"
 #endif // QT_H
 
diff --git a/src/widgets/tqradiobutton.cpp b/src/widgets/tqradiobutton.cpp
index 263c17f20..30e63970d 100644
--- a/src/widgets/tqradiobutton.cpp
+++ b/src/widgets/tqradiobutton.cpp
@@ -40,7 +40,7 @@
 
 #include "tqradiobutton.h"
 #ifndef TQT_NO_RADIOBUTTON
-#include "ntqbuttongroup.h"
+#include "tqbuttongroup.h"
 #include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "tqpixmap.h"
diff --git a/src/widgets/tqradiobutton.h b/src/widgets/tqradiobutton.h
index 1c7c0ae34..64410b739 100644
--- a/src/widgets/tqradiobutton.h
+++ b/src/widgets/tqradiobutton.h
@@ -42,7 +42,7 @@
 #define TQRADIOBUTTON_H
 
 #ifndef QT_H
-#include "ntqbutton.h"
+#include "tqbutton.h"
 #endif // QT_H
 
 #ifndef TQT_NO_RADIOBUTTON
diff --git a/src/widgets/tqscrollview.cpp b/src/widgets/tqscrollview.cpp
index 603110592..de60cccf3 100644
--- a/src/widgets/tqscrollview.cpp
+++ b/src/widgets/tqscrollview.cpp
@@ -51,7 +51,7 @@
 #include "ntqapplication.h"
 #include "tqtimer.h"
 #include "tqstyle.h"
-#include "ntqlistview.h"
+#include "tqlistview.h"
 #ifdef TQ_WS_MAC
 # include "qt_mac.h"
 #endif
diff --git a/src/widgets/tqscrollview.h b/src/widgets/tqscrollview.h
index 21cc37237..9c1606481 100644
--- a/src/widgets/tqscrollview.h
+++ b/src/widgets/tqscrollview.h
@@ -41,7 +41,7 @@
 #define TQSCROLLVIEW_H
 
 #ifndef QT_H
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "tqscrollbar.h"
 #endif // QT_H
 
diff --git a/src/widgets/qtabbar.cpp b/src/widgets/tqtabbar.cpp
index e740a4782..3e3f623f7 100644
--- a/src/widgets/qtabbar.cpp
+++ b/src/widgets/tqtabbar.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#include "ntqtabbar.h"
+#include "tqtabbar.h"
 #ifndef TQT_NO_TABBAR
 #include "ntqaccel.h"
 #include "tqbitmap.h"
@@ -58,7 +58,7 @@
 
 
 /*!
-    \class TQTab ntqtabbar.h
+    \class TQTab tqtabbar.h
     \brief The TQTab class provides the structures in a TQTabBar.
 
     \ingroup advanced
@@ -169,7 +169,7 @@ TQTab::~TQTab()
 }
 
 /*!
-    \class TQTabBar ntqtabbar.h
+    \class TQTabBar tqtabbar.h
     \brief The TQTabBar class provides a tab bar, e.g. for use in tabbed dialogs.
 
     \ingroup advanced
@@ -213,7 +213,7 @@ TQTab::~TQTab()
     by indexOf(). The current tab can be set by index or tab pointer
     using one of the setCurrentTab() functions.
 
-    <img src=qtabbar-m.png> <img src=qtabbar-w.png>
+    <img src=tqtabbar-m.png> <img src=tqtabbar-w.png>
 */
 
 /*!
diff --git a/src/widgets/ntqtabbar.h b/src/widgets/tqtabbar.h
index b9abccde0..b9abccde0 100644
--- a/src/widgets/ntqtabbar.h
+++ b/src/widgets/tqtabbar.h
diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/tqtabwidget.cpp
index bd698765f..f5781754f 100644
--- a/src/widgets/qtabwidget.cpp
+++ b/src/widgets/tqtabwidget.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "ntqtabwidget.h"
+#include "tqtabwidget.h"
 #ifndef TQT_NO_TABWIDGET
 #include "tqobjectlist.h"
-#include "ntqtabbar.h"
+#include "tqtabbar.h"
 #include "ntqapplication.h"
 #include "tqwidgetstack.h"
 #include "tqbitmap.h"
@@ -55,7 +55,7 @@
 #endif
 
 /*!
-    \class TQTabWidget ntqtabwidget.h
+    \class TQTabWidget tqtabwidget.h
     \brief The TQTabWidget class provides a stack of tabbed widgets.
 
     \ingroup organizers
@@ -121,7 +121,7 @@
     (at the top, providing the tabs) and a TQWidgetStack (most of the
     area, organizing the individual pages).
 
-    <img src=qtabwidget-m.png> <img src=qtabwidget-w.png>
+    <img src=tqtabwidget-m.png> <img src=tqtabwidget-w.png>
 
     \sa TQTabDialog, TQToolBox
 */
diff --git a/src/widgets/ntqtabwidget.h b/src/widgets/tqtabwidget.h
index 7ab17b504..7ab17b504 100644
--- a/src/widgets/ntqtabwidget.h
+++ b/src/widgets/tqtabwidget.h
diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp
index ed03eba64..304c27172 100644
--- a/src/widgets/tqtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -59,7 +59,7 @@
 #include "tqevent.h"
 #include "tqtimer.h"
 #include "ntqapplication.h"
-#include "ntqlistbox.h"
+#include "tqlistbox.h"
 #include "ntqvbox.h"
 #include "ntqapplication.h"
 #include "tqclipboard.h"
diff --git a/src/widgets/tqtoolbar.cpp b/src/widgets/tqtoolbar.cpp
index b8a66fb7a..99947c59e 100644
--- a/src/widgets/tqtoolbar.cpp
+++ b/src/widgets/tqtoolbar.cpp
@@ -45,7 +45,7 @@
 #include "tqtooltip.h"
 #include "ntqcursor.h"
 #include "ntqlayout.h"
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "tqobjectlist.h"
 #include "tqpainter.h"
 #include "ntqdrawutil.h"
diff --git a/src/widgets/tqtoolbox.cpp b/src/widgets/tqtoolbox.cpp
index 948acf7d7..ad97a79c3 100644
--- a/src/widgets/tqtoolbox.cpp
+++ b/src/widgets/tqtoolbox.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_TOOLBOX
 
-#include <ntqbutton.h>
+#include <tqbutton.h>
 #include <ntqlayout.h>
 #include <tqscrollview.h>
 #include <tqpainter.h>
diff --git a/src/widgets/tqtoolbox.h b/src/widgets/tqtoolbox.h
index c5559fc81..752266d19 100644
--- a/src/widgets/tqtoolbox.h
+++ b/src/widgets/tqtoolbox.h
@@ -42,7 +42,7 @@
 #define TQTOOLBOX_H
 
 #ifndef QT_H
-#include <ntqframe.h>
+#include <tqframe.h>
 #include <tqiconset.h>
 #endif // QT_H
 
diff --git a/src/widgets/tqtoolbutton.h b/src/widgets/tqtoolbutton.h
index 294cb4571..34842590e 100644
--- a/src/widgets/tqtoolbutton.h
+++ b/src/widgets/tqtoolbutton.h
@@ -42,7 +42,7 @@
 #define TQTOOLBUTTON_H
 
 #ifndef QT_H
-#include "ntqbutton.h"
+#include "tqbutton.h"
 #include "tqstring.h"
 #include "tqpixmap.h"
 #include "tqiconset.h"
diff --git a/src/widgets/tqwidgetresizehandler.cpp b/src/widgets/tqwidgetresizehandler.cpp
index eb3919615..248d1b3f9 100644
--- a/src/widgets/tqwidgetresizehandler.cpp
+++ b/src/widgets/tqwidgetresizehandler.cpp
@@ -41,7 +41,7 @@
 #include "tqwidgetresizehandler_p.h"
 
 #ifndef TQT_NO_RESIZEHANDLER
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "ntqapplication.h"
 #include "ntqcursor.h"
 #include "tqsizegrip.h"
diff --git a/src/widgets/tqwidgetstack.cpp b/src/widgets/tqwidgetstack.cpp
index b065fc35a..6e043943b 100644
--- a/src/widgets/tqwidgetstack.cpp
+++ b/src/widgets/tqwidgetstack.cpp
@@ -45,8 +45,8 @@
 
 #include "tqobjectlist.h"
 #include "ntqfocusdata.h"
-#include "ntqbutton.h"
-#include "ntqbuttongroup.h"
+#include "tqbutton.h"
+#include "tqbuttongroup.h"
 
 #include "ntqapplication.h"
 
diff --git a/src/widgets/tqwidgetstack.h b/src/widgets/tqwidgetstack.h
index 5858ea06c..93d83da6f 100644
--- a/src/widgets/tqwidgetstack.h
+++ b/src/widgets/tqwidgetstack.h
@@ -42,7 +42,7 @@
 #define TQWIDGETSTACK_H
 
 #ifndef QT_H
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "tqintdict.h"
 #include "tqptrdict.h"
 #endif // QT_H