42 files changed, 89 insertions, 89 deletions
diff --git a/src/widgets/ntqgridview.h b/src/widgets/ntqgridview.h
index 6a8a3c182..1ec47a823 100644
--- a/src/widgets/ntqgridview.h
+++ b/src/widgets/ntqgridview.h
@@ -42,7 +42,7 @@
 #define TQGRIDVIEW_H
 
 #ifndef QT_H
-#include "ntqscrollview.h"
+#include "tqscrollview.h"
 #endif // QT_H
 
 #ifndef TQT_NO_GRIDVIEW
diff --git a/src/widgets/ntqlistbox.h b/src/widgets/ntqlistbox.h
index 39a9b75de..cfc2b7682 100644
--- a/src/widgets/ntqlistbox.h
+++ b/src/widgets/ntqlistbox.h
@@ -42,7 +42,7 @@
 #define TQLISTBOX_H
 
 #ifndef QT_H
-#include "ntqscrollview.h"
+#include "tqscrollview.h"
 #include "tqpixmap.h"
 #endif // QT_H
 
diff --git a/src/widgets/ntqlistview.h b/src/widgets/ntqlistview.h
index b46513372..45eb89a8e 100644
--- a/src/widgets/ntqlistview.h
+++ b/src/widgets/ntqlistview.h
@@ -42,7 +42,7 @@
 #define TQLISTVIEW_H
 
 #ifndef QT_H
-#include "ntqscrollview.h"
+#include "tqscrollview.h"
 #endif // QT_H
 
 #ifndef TQT_NO_LISTVIEW
diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp
index 31fbe6349..8446c7f46 100644
--- a/src/widgets/qbutton.cpp
+++ b/src/widgets/qbutton.cpp
@@ -47,8 +47,8 @@
 #include "ntqaccel.h"
 #include "tqpixmapcache.h"
 #include "ntqapplication.h"
-#include "ntqpushbutton.h"
-#include "ntqradiobutton.h"
+#include "tqpushbutton.h"
+#include "tqradiobutton.h"
 #include "ntqguardedptr.h"
 #include "../kernel/qinternal_p.h"
 
diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/qbuttongroup.cpp
index c1a708b80..08c1919a7 100644
--- a/src/widgets/qbuttongroup.cpp
+++ b/src/widgets/qbuttongroup.cpp
@@ -43,7 +43,7 @@
 #include "ntqbutton.h"
 #include "tqptrlist.h"
 #include "ntqapplication.h"
-#include "ntqradiobutton.h"
+#include "tqradiobutton.h"
 
 
 
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index 6f9176175..b98de479f 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -47,7 +47,7 @@
 #include "tqtimer.h"
 #include "tqdatetime.h"
 #include "ntqguardedptr.h"
-#include "ntqscrollview.h"
+#include "tqscrollview.h"
 
 /*
   Internal class to get access to protected TQWidget-members
diff --git a/src/widgets/qeffects_p.h b/src/widgets/qeffects_p.h
index dad8fce9f..d3beb3055 100644
--- a/src/widgets/qeffects_p.h
+++ b/src/widgets/qeffects_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qeffects.cpp, qcombobox.cpp, tqpopupmenu.cpp and tqtooltip.cpp.
+// of qeffects.cpp, tqcombobox.cpp, tqpopupmenu.cpp and tqtooltip.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/qgroupbox.cpp
index 5145a5698..f37b5f6d7 100644
--- a/src/widgets/qgroupbox.cpp
+++ b/src/widgets/qgroupbox.cpp
@@ -44,13 +44,13 @@
 #include "tqpainter.h"
 #include "tqbitmap.h"
 #include "ntqaccel.h"
-#include "ntqradiobutton.h"
+#include "tqradiobutton.h"
 #include "ntqfocusdata.h"
 #include "tqobjectlist.h"
 #include "ntqdrawutil.h"
 #include "ntqapplication.h"
 #include "tqstyle.h"
-#include "ntqcheckbox.h"
+#include "tqcheckbox.h"
 #include "ntqbuttongroup.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 #include "ntqaccessible.h"
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index 5ee18d929..5c00bca11 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -58,7 +58,7 @@
 #include "tqpopupmenu.h"
 #include "ntqtl.h"
 #include "tqdragobject.h"
-#include "ntqlineedit.h"
+#include "tqlineedit.h"
 #include "ntqvbox.h"
 #include "tqtooltip.h"
 #include "tqstyle.h"
diff --git a/src/widgets/qmultilineedit.cpp b/src/widgets/qmultilineedit.cpp
index 85254a314..bd8ffd8cd 100644
--- a/src/widgets/qmultilineedit.cpp
+++ b/src/widgets/qmultilineedit.cpp
@@ -41,7 +41,7 @@
 #include "ntqmultilineedit.h"
 #ifndef TQT_NO_MULTILINEEDIT
 #include "tqpainter.h"
-#include "ntqscrollbar.h"
+#include "tqscrollbar.h"
 #include "ntqcursor.h"
 #include "tqclipboard.h"
 #include "tqpixmap.h"
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index 876cc428c..72cfdba84 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -5,11 +5,11 @@ widgets {
 
 	HEADERS += $$WIDGETS_H/ntqbuttongroup.h \
 		  $$WIDGETS_H/ntqbutton.h \
-		  $$WIDGETS_P/qdialogbuttons_p.h \
-		  $$WIDGETS_H/ntqcheckbox.h \
-		  $$WIDGETS_H/ntqcombobox.h \
+		  $$WIDGETS_P/tqdialogbuttons_p.h \
+		  $$WIDGETS_H/tqcheckbox.h \
+		  $$WIDGETS_H/tqcombobox.h \
 		  $$WIDGETS_P/tqwidgetresizehandler_p.h \
-		  $$WIDGETS_H/ntqdial.h \
+		  $$WIDGETS_H/tqdial.h \
 		  $$WIDGETS_H/ntqdockarea.h \
 		  $$WIDGETS_H/ntqdockwindow.h \
 		  $$WIDGETS_H/ntqframe.h \
@@ -22,8 +22,8 @@ widgets {
 		  $$WIDGETS_H/ntqhbox.h \
 		  $$WIDGETS_H/tqiconview.h \
 		  $$WIDGETS_H/tqlabel.h \
-		  $$WIDGETS_H/ntqlcdnumber.h \
-		  $$WIDGETS_H/ntqlineedit.h \
+		  $$WIDGETS_H/tqlcdnumber.h \
+		  $$WIDGETS_H/tqlineedit.h \
 		  $$WIDGETS_H/ntqlistbox.h \
 		  $$WIDGETS_H/ntqlistview.h \
 		  $$WIDGETS_H/tqmainwindow.h \
@@ -32,14 +32,14 @@ widgets {
 		  $$WIDGETS_H/ntqmultilineedit.h \
 		  $$WIDGETS_H/tqpopupmenu.h \
 		  $$WIDGETS_H/ntqprogressbar.h \
-		  $$WIDGETS_H/ntqpushbutton.h \
-		  $$WIDGETS_H/ntqradiobutton.h \
+		  $$WIDGETS_H/tqpushbutton.h \
+		  $$WIDGETS_H/tqradiobutton.h \
 		  $$WIDGETS_H/ntqrangecontrol.h \
-		  $$WIDGETS_H/ntqscrollbar.h \
-		  $$WIDGETS_H/ntqscrollview.h \
-		  $$WIDGETS_H/ntqslider.h \
+		  $$WIDGETS_H/tqscrollbar.h \
+		  $$WIDGETS_H/tqscrollview.h \
+		  $$WIDGETS_H/tqslider.h \
 		  $$WIDGETS_H/ntqsplashscreen.h \
-		  $$WIDGETS_H/ntqspinbox.h \
+		  $$WIDGETS_H/tqspinbox.h \
 		  $$WIDGETS_H/ntqsplitter.h \
 		  $$WIDGETS_H/tqstatusbar.h \
 		  $$WIDGETS_H/ntqtabbar.h \
@@ -67,11 +67,11 @@ widgets {
 
 	SOURCES += $$WIDGETS_CPP/qbuttongroup.cpp \
 		  $$WIDGETS_CPP/qbutton.cpp \
-		  $$WIDGETS_CPP/qdialogbuttons.cpp \
-		  $$WIDGETS_CPP/qcheckbox.cpp \
-		  $$WIDGETS_CPP/qcombobox.cpp \
+		  $$WIDGETS_CPP/tqdialogbuttons.cpp \
+		  $$WIDGETS_CPP/tqcheckbox.cpp \
+		  $$WIDGETS_CPP/tqcombobox.cpp \
 		  $$WIDGETS_CPP/tqwidgetresizehandler.cpp \
-		  $$WIDGETS_CPP/qdial.cpp \
+		  $$WIDGETS_CPP/tqdial.cpp \
 		  $$WIDGETS_CPP/qdockarea.cpp \
 		  $$WIDGETS_CPP/qdockwindow.cpp \
 		  $$WIDGETS_CPP/qframe.cpp \
@@ -84,8 +84,8 @@ widgets {
 		  $$WIDGETS_CPP/qhbox.cpp \
 		  $$WIDGETS_CPP/tqiconview.cpp \
 		  $$WIDGETS_CPP/tqlabel.cpp \
-		  $$WIDGETS_CPP/qlcdnumber.cpp \
-		  $$WIDGETS_CPP/qlineedit.cpp \
+		  $$WIDGETS_CPP/tqlcdnumber.cpp \
+		  $$WIDGETS_CPP/tqlineedit.cpp \
 		  $$WIDGETS_CPP/qlistbox.cpp \
 		  $$WIDGETS_CPP/qlistview.cpp \
 		  $$WIDGETS_CPP/tqmainwindow.cpp \
@@ -94,15 +94,15 @@ widgets {
 		  $$WIDGETS_CPP/qmultilineedit.cpp \
 		  $$WIDGETS_CPP/tqpopupmenu.cpp \
 		  $$WIDGETS_CPP/qprogressbar.cpp \
-		  $$WIDGETS_CPP/qpushbutton.cpp \
-		  $$WIDGETS_CPP/qradiobutton.cpp \
+		  $$WIDGETS_CPP/tqpushbutton.cpp \
+		  $$WIDGETS_CPP/tqradiobutton.cpp \
 		  $$WIDGETS_CPP/qrangecontrol.cpp \
-		  $$WIDGETS_CPP/qscrollbar.cpp \
-		  $$WIDGETS_CPP/qscrollview.cpp \
-		  $$WIDGETS_CPP/qslider.cpp \
+		  $$WIDGETS_CPP/tqscrollbar.cpp \
+		  $$WIDGETS_CPP/tqscrollview.cpp \
+		  $$WIDGETS_CPP/tqslider.cpp \
 		  $$WIDGETS_CPP/qsplashscreen.cpp \
-		  $$WIDGETS_CPP/qspinbox.cpp \
-		  $$WIDGETS_CPP/qspinwidget.cpp \
+		  $$WIDGETS_CPP/tqspinbox.cpp \
+		  $$WIDGETS_CPP/tqspinwidget.cpp \
 		  $$WIDGETS_CPP/qsplitter.cpp \
 		  $$WIDGETS_CPP/tqstatusbar.cpp \
 		  $$WIDGETS_CPP/tqsyntaxhighlighter.cpp \
diff --git a/src/widgets/tqaction.cpp b/src/widgets/tqaction.cpp
index 31d308420..a7e5c0e58 100644
--- a/src/widgets/tqaction.cpp
+++ b/src/widgets/tqaction.cpp
@@ -45,7 +45,7 @@
 #include "tqpopupmenu.h"
 #include "ntqaccel.h"
 #include "tqtoolbutton.h"
-#include "ntqcombobox.h"
+#include "tqcombobox.h"
 #include "tqtooltip.h"
 #include "tqwhatsthis.h"
 #include "tqstatusbar.h"
diff --git a/src/widgets/qcheckbox.cpp b/src/widgets/tqcheckbox.cpp
index 4e4d913ba..a9cf27d0d 100644
--- a/src/widgets/qcheckbox.cpp
+++ b/src/widgets/tqcheckbox.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqcheckbox.h"
+#include "tqcheckbox.h"
 #ifndef TQT_NO_CHECKBOX
 #include "tqpainter.h"
 #include "ntqdrawutil.h"
@@ -50,7 +50,7 @@
 #include "tqstyle.h"
 
 /*!
-    \class TQCheckBox ntqcheckbox.h
+    \class TQCheckBox tqcheckbox.h
     \brief The TQCheckBox widget provides a checkbox with a text label.
 
     \ingroup basic
diff --git a/src/widgets/ntqcheckbox.h b/src/widgets/tqcheckbox.h
index 4a63e4b4a..4a63e4b4a 100644
--- a/src/widgets/ntqcheckbox.h
+++ b/src/widgets/tqcheckbox.h
diff --git a/src/widgets/qcombobox.cpp b/src/widgets/tqcombobox.cpp
index a491e7ca6..9914c4398 100644
--- a/src/widgets/qcombobox.cpp
+++ b/src/widgets/tqcombobox.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqcombobox.h"
+#include "tqcombobox.h"
 #ifndef TQT_NO_COMBOBOX
 #include "tqpopupmenu.h"
 #include "ntqlistbox.h"
@@ -48,11 +48,11 @@
 #include "tqpixmap.h"
 #include "tqtimer.h"
 #include "ntqapplication.h"
-#include "ntqlineedit.h"
+#include "tqlineedit.h"
 #include "tqbitmap.h"
 #include "qeffects_p.h"
 #include "tqstringlist.h"
-#include "ntqcombobox.h"
+#include "tqcombobox.h"
 #include "tqstyle.h"
 #include <limits.h>
 #if defined(QT_ACCESSIBILITY_SUPPORT)
@@ -60,7 +60,7 @@
 #endif
 
 /*!
-    \class TQComboBox ntqcombobox.h
+    \class TQComboBox tqcombobox.h
     \brief The TQComboBox widget is a combined button and popup list.
 
     \ingroup basic
@@ -145,10 +145,10 @@
     using setAutoCompletion() and whether or not the user can add
     duplicates is set with setDuplicatesEnabled().
 
-    <img src="qcombo1-m.png">(Motif 1, read-only)<br clear=all>
-    <img src="qcombo2-m.png">(Motif 2, editable)<br clear=all>
-    <img src="qcombo3-m.png">(Motif 2, read-only)<br clear=all>
-    <img src="qcombo1-w.png">(Windows style)
+    <img src="tqcombo1-m.png">(Motif 1, read-only)<br clear=all>
+    <img src="tqcombo2-m.png">(Motif 2, editable)<br clear=all>
+    <img src="tqcombo3-m.png">(Motif 2, read-only)<br clear=all>
+    <img src="tqcombo1-w.png">(Windows style)
 
     Depending on the style, TQComboBox will use a TQListBox or a
     TQPopupMenu to display the list of items. See setListBox() for
diff --git a/src/widgets/ntqcombobox.h b/src/widgets/tqcombobox.h
index 296148549..296148549 100644
--- a/src/widgets/ntqcombobox.h
+++ b/src/widgets/tqcombobox.h
diff --git a/src/widgets/qdial.cpp b/src/widgets/tqdial.cpp
index f11218bf3..75793b5c1 100644
--- a/src/widgets/qdial.cpp
+++ b/src/widgets/tqdial.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqdial.h"
+#include "tqdial.h"
 
 #ifndef TQT_NO_DIAL
 
@@ -87,7 +87,7 @@ public:
 
 
 /*!
-    \class TQDial ntqdial.h
+    \class TQDial tqdial.h
 
     \brief The TQDial class provides a rounded range control (like a speedometer or potentiometer).
 
@@ -133,7 +133,7 @@ public:
     right/down arrow keys move by lineStep(), page up and page down by
     pageStep() and Home and End to minValue() and maxValue().
 
-    <img src=qdial-m.png> <img src=qdial-w.png>
+    <img src=tqdial-m.png> <img src=tqdial-w.png>
 
     \sa TQScrollBar TQSpinBox
     \link guibooks.html#fowler GUI Design Handbook: Slider\endlink
diff --git a/src/widgets/ntqdial.h b/src/widgets/tqdial.h
index 7baf98e53..7baf98e53 100644
--- a/src/widgets/ntqdial.h
+++ b/src/widgets/tqdial.h
diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/tqdialogbuttons.cpp
index d75a16f96..b20f70350 100644
--- a/src/widgets/qdialogbuttons.cpp
+++ b/src/widgets/tqdialogbuttons.cpp
@@ -36,16 +36,16 @@
 **
 **********************************************************************/
 
-#include "qdialogbuttons_p.h"
+#include "tqdialogbuttons_p.h"
 #ifndef TQT_NO_DIALOGBUTTONS
 
 #include <ntqapplication.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <ntqguardedptr.h>
 #include <tqmap.h>
 #include <ntqvariant.h>
 #ifndef TQT_NO_DIALOG
-#include <ntqdialog.h>
+#include <tqdialog.h>
 #endif // TQT_NO_DIALOG
 #include <ntqlayout.h>
 #include <tqstyle.h>
@@ -241,7 +241,7 @@ TQDialogButtons::orientation() const
 TQWidget *
 TQDialogButtons::createButton(Button b)
 {
-    TQPushButton *ret = new TQPushButton(this, "qdialog_button");
+    TQPushButton *ret = new TQPushButton(this, "tqdialog_button");
     TQObject::connect(ret, TQ_SIGNAL(clicked()), this, TQ_SLOT(handleClicked()));
     if(d->text.contains(b)) {
 	ret->setText(d->text[b]);
diff --git a/src/widgets/qdialogbuttons_p.h b/src/widgets/tqdialogbuttons_p.h
index a5667245f..a5667245f 100644
--- a/src/widgets/qdialogbuttons_p.h
+++ b/src/widgets/tqdialogbuttons_p.h
diff --git a/src/widgets/tqiconview.h b/src/widgets/tqiconview.h
index bffaad207..1be94b651 100644
--- a/src/widgets/tqiconview.h
+++ b/src/widgets/tqiconview.h
@@ -42,7 +42,7 @@
 #define TQICONVIEW_H
 
 #ifndef QT_H
-#include "ntqscrollview.h"
+#include "tqscrollview.h"
 #include "tqstring.h"
 #include "tqrect.h"
 #include "tqpoint.h"
diff --git a/src/widgets/qlcdnumber.cpp b/src/widgets/tqlcdnumber.cpp
index 246804f45..e6dbf453c 100644
--- a/src/widgets/qlcdnumber.cpp
+++ b/src/widgets/tqlcdnumber.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "ntqlcdnumber.h"
+#include "tqlcdnumber.h"
 #ifndef TQT_NO_LCDNUMBER
 #include "tqbitarray.h"
 #include "tqpainter.h"
 
 
 /*!
-    \class TQLCDNumber ntqlcdnumber.h
+    \class TQLCDNumber tqlcdnumber.h
 
     \brief The TQLCDNumber widget displays a number with LCD-like digits.
 
@@ -83,7 +83,7 @@
     http://www.nvg.ntnu.no/sinclair/computers/zxspectrum/zxspectrum.htm
     Sinclair Spectrum\endlink.
 
-    <img src=qlcdnum-m.png> <img src=qlcdnum-w.png>
+    <img src=tqlcdnum-m.png> <img src=tqlcdnum-w.png>
 
     \sa TQLabel, TQFrame
 */
diff --git a/src/widgets/ntqlcdnumber.h b/src/widgets/tqlcdnumber.h
index e74de7cb6..e74de7cb6 100644
--- a/src/widgets/ntqlcdnumber.h
+++ b/src/widgets/tqlcdnumber.h
diff --git a/src/widgets/qlineedit.cpp b/src/widgets/tqlineedit.cpp
index d37c43539..558069752 100644
--- a/src/widgets/qlineedit.cpp
+++ b/src/widgets/tqlineedit.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqlineedit.h"
+#include "tqlineedit.h"
 #ifndef TQT_NO_LINEEDIT
 
 // Keep this position to avoid patch rejection
@@ -361,7 +361,7 @@ struct TQLineEditPrivate : public TQt
     Any other key sequence that represents a valid character, will
     cause the character to be inserted into the line edit.
 
-    <img src=qlined-m.png> <img src=qlined-w.png>
+    <img src=tqlined-m.png> <img src=tqlined-w.png>
 
     \sa TQTextEdit TQLabel TQComboBox
 	\link guibooks.html#fowler GUI Design Handbook: Field, Entry\endlink
diff --git a/src/widgets/ntqlineedit.h b/src/widgets/tqlineedit.h
index f5bf18c68..f5bf18c68 100644
--- a/src/widgets/ntqlineedit.h
+++ b/src/widgets/tqlineedit.h
diff --git a/src/widgets/tqmainwindow.cpp b/src/widgets/tqmainwindow.cpp
index 7b66839db..cda9afcb3 100644
--- a/src/widgets/tqmainwindow.cpp
+++ b/src/widgets/tqmainwindow.cpp
@@ -54,7 +54,7 @@
 #include "tqpopupmenu.h"
 #include "tqtoolbar.h"
 #include "tqstatusbar.h"
-#include "ntqscrollview.h"
+#include "tqscrollview.h"
 #include "tqtooltip.h"
 #include "tqdatetime.h"
 #include "tqwhatsthis.h"
diff --git a/src/widgets/qpushbutton.cpp b/src/widgets/tqpushbutton.cpp
index 37cbccd9d..105bae12a 100644
--- a/src/widgets/qpushbutton.cpp
+++ b/src/widgets/tqpushbutton.cpp
@@ -38,9 +38,9 @@
 **
 **********************************************************************/
 
-#include "ntqpushbutton.h"
+#include "tqpushbutton.h"
 #ifndef TQT_NO_PUSHBUTTON
-#include "ntqdialog.h"
+#include "tqdialog.h"
 #include "tqfontmetrics.h"
 #include "tqpainter.h"
 #include "ntqdrawutil.h"
@@ -56,7 +56,7 @@
 #endif
 
 /*!
-    \class TQPushButton ntqpushbutton.h
+    \class TQPushButton tqpushbutton.h
     \brief The TQPushButton widget provides a command button.
 
     \ingroup basic
@@ -141,7 +141,7 @@
     Other classes of buttons are option buttons (see TQRadioButton) and
     check boxes (see TQCheckBox).
 
-    <img src="qpushbt-m.png"> <img src="qpushbt-w.png">
+    <img src="tqpushbt-m.png"> <img src="tqpushbt-w.png">
 
     In TQt, the TQButton abstract base class provides most of the modes
     and other API, and TQPushButton provides GUI logic. See TQButton for
diff --git a/src/widgets/ntqpushbutton.h b/src/widgets/tqpushbutton.h
index 13b76e9fe..13b76e9fe 100644
--- a/src/widgets/ntqpushbutton.h
+++ b/src/widgets/tqpushbutton.h
diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/tqradiobutton.cpp
index dead844e5..263c17f20 100644
--- a/src/widgets/qradiobutton.cpp
+++ b/src/widgets/tqradiobutton.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqradiobutton.h"
+#include "tqradiobutton.h"
 #ifndef TQT_NO_RADIOBUTTON
 #include "ntqbuttongroup.h"
 #include "tqpainter.h"
@@ -51,7 +51,7 @@
 #include "tqstyle.h"
 
 /*!
-    \class TQRadioButton ntqradiobutton.h
+    \class TQRadioButton tqradiobutton.h
     \brief The TQRadioButton widget provides a radio button with a text or pixmap label.
 
     \ingroup basic
@@ -77,7 +77,7 @@
     pixmap. The text can be set in the constructor or with setText();
     the pixmap is set with setPixmap().
 
-    <img src=qradiobt-m.png> <img src=qradiobt-w.png>
+    <img src=tqradiobt-m.png> <img src=tqradiobt-w.png>
 
     \important text, setText, text, pixmap, setPixmap, accel, setAccel, isToggleButton, setDown, isDown, isOn, state, autoRepeat, isExclusiveToggle, group, setAutoRepeat, toggle, pressed, released, clicked, toggled, state stateChanged
 
diff --git a/src/widgets/ntqradiobutton.h b/src/widgets/tqradiobutton.h
index 1c7c0ae34..1c7c0ae34 100644
--- a/src/widgets/ntqradiobutton.h
+++ b/src/widgets/tqradiobutton.h
diff --git a/src/widgets/qscrollbar.cpp b/src/widgets/tqscrollbar.cpp
index 2b350c30a..383ce44bd 100644
--- a/src/widgets/qscrollbar.cpp
+++ b/src/widgets/tqscrollbar.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqscrollbar.h"
+#include "tqscrollbar.h"
 #ifndef TQT_NO_SCROLLBAR
 #include "tqpainter.h"
 #include "tqbitmap.h"
diff --git a/src/widgets/ntqscrollbar.h b/src/widgets/tqscrollbar.h
index 6a298c96f..6a298c96f 100644
--- a/src/widgets/ntqscrollbar.h
+++ b/src/widgets/tqscrollbar.h
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/tqscrollview.cpp
index 9c3bc060b..603110592 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/tqscrollview.cpp
@@ -40,13 +40,13 @@
 
 #include "tqwidget.h"
 #ifndef TQT_NO_SCROLLVIEW
-#include "ntqscrollbar.h"
+#include "tqscrollbar.h"
 #include "tqobjectlist.h"
 #include "tqpainter.h"
 #include "tqpixmap.h"
 #include "ntqcursor.h"
 #include "ntqfocusdata.h"
-#include "ntqscrollview.h"
+#include "tqscrollview.h"
 #include "tqptrdict.h"
 #include "ntqapplication.h"
 #include "tqtimer.h"
@@ -117,7 +117,7 @@ public:
         : TQWidget ( parent,name,f) {}
 };
 
-#include "qscrollview.moc"
+#include "tqscrollview.moc"
 
 class TQScrollViewData {
 public:
@@ -348,7 +348,7 @@ void TQScrollViewData::viewportResized( int w, int h )
 
 
 /*!
-    \class TQScrollView ntqscrollview.h
+    \class TQScrollView tqscrollview.h
     \brief The TQScrollView widget provides a scrolling area with on-demand scroll bars.
 
     \ingroup abstractwidgets
@@ -375,7 +375,7 @@ void TQScrollViewData::viewportResized( int w, int h )
 
     \section1 Using One Big Widget
 
-    \img qscrollview-vp2.png
+    \img tqscrollview-vp2.png
 
     The first, simplest usage of TQScrollView (depicted above), is
     appropriate for scrolling areas that are never more than about
@@ -406,7 +406,7 @@ void TQScrollViewData::viewportResized( int w, int h )
 
     \section1 Using a Very Big View with Some Widgets
 
-    \img qscrollview-vp.png
+    \img tqscrollview-vp.png
 
     The second usage of TQScrollView (depicted above) is appropriate
     when few, if any, widgets are on a very large scrolling area that
@@ -434,7 +434,7 @@ void TQScrollViewData::viewportResized( int w, int h )
     \section1 Using a Very Big View with Many Widgets
 
     \target enableclipper
-    \img qscrollview-cl.png
+    \img tqscrollview-cl.png
 
     The final usage of TQScrollView (depicted above) is appropriate
     when many widgets are on a very large scrolling area that is
@@ -541,7 +541,7 @@ void TQScrollViewData::viewportResized( int w, int h )
     scrollview subclasses. This will change in a future version of TQt
     and we recommend specifying the WNoAutoErase flag explicitly.
 
-    <img src=qscrollview-m.png> <img src=qscrollview-w.png>
+    <img src=tqscrollview-m.png> <img src=tqscrollview-w.png>
 */
 
 
diff --git a/src/widgets/ntqscrollview.h b/src/widgets/tqscrollview.h
index c9dcc8846..21cc37237 100644
--- a/src/widgets/ntqscrollview.h
+++ b/src/widgets/tqscrollview.h
@@ -42,7 +42,7 @@
 
 #ifndef QT_H
 #include "ntqframe.h"
-#include "ntqscrollbar.h"
+#include "tqscrollbar.h"
 #endif // QT_H
 
 #ifndef TQT_NO_SCROLLVIEW
diff --git a/src/widgets/qslider.cpp b/src/widgets/tqslider.cpp
index df7555031..98d61b68d 100644
--- a/src/widgets/qslider.cpp
+++ b/src/widgets/tqslider.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqslider.h"
+#include "tqslider.h"
 #ifndef TQT_NO_SLIDER
 #include "tqpainter.h"
 #include "ntqdrawutil.h"
@@ -88,7 +88,7 @@ struct TQSliderPrivate
     A slider accepts focus on Tab and uses the mouse wheel and a
     suitable keyboard interface.
 
-    <img src=qslider-m.png> <img src=qslider-w.png>
+    <img src=tqslider-m.png> <img src=tqslider-w.png>
 
     \important setRange
 
diff --git a/src/widgets/ntqslider.h b/src/widgets/tqslider.h
index af60245e3..af60245e3 100644
--- a/src/widgets/ntqslider.h
+++ b/src/widgets/tqslider.h
diff --git a/src/widgets/qspinbox.cpp b/src/widgets/tqspinbox.cpp
index d6d85beef..ff336035d 100644
--- a/src/widgets/qspinbox.cpp
+++ b/src/widgets/tqspinbox.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "ntqspinbox.h"
+#include "tqspinbox.h"
 #ifndef TQT_NO_SPINBOX
 
 #include "ntqcursor.h"
-#include "ntqpushbutton.h"
+#include "tqpushbutton.h"
 #include "tqpainter.h"
 #include "tqbitmap.h"
-#include "ntqlineedit.h"
+#include "tqlineedit.h"
 #include "ntqvalidator.h"
 #include "tqpixmapcache.h"
 #include "ntqapplication.h"
@@ -218,7 +218,7 @@ TQValidator::State TQSpinBoxValidator::validate( TQString& str, int& pos ) const
 	};
     \endcode
 
-    <img src=qspinbox-m.png> <img src=qspinbox-w.png>
+    <img src=tqspinbox-m.png> <img src=tqspinbox-w.png>
 
     \sa TQScrollBar TQSlider
     \link guibooks.html#fowler GUI Design Handbook: Spin Box \endlink
diff --git a/src/widgets/ntqspinbox.h b/src/widgets/tqspinbox.h
index 345857c74..345857c74 100644
--- a/src/widgets/ntqspinbox.h
+++ b/src/widgets/tqspinbox.h
diff --git a/src/widgets/qspinwidget.cpp b/src/widgets/tqspinwidget.cpp
index c5b237d41..a66e90d1d 100644
--- a/src/widgets/qspinwidget.cpp
+++ b/src/widgets/tqspinwidget.cpp
@@ -73,7 +73,7 @@ public:
 
 /*!
 
-    \class TQSpinWidget qspinwidget.h
+    \class TQSpinWidget tqspinwidget.h
     \brief The TQSpinWidget class is an internal range control related class.
 
     \internal
diff --git a/src/widgets/tqtextedit.h b/src/widgets/tqtextedit.h
index 0b88f8593..f58b91d09 100644
--- a/src/widgets/tqtextedit.h
+++ b/src/widgets/tqtextedit.h
@@ -42,7 +42,7 @@
 #define TQTEXTEDIT_H
 
 #ifndef QT_H
-#include "ntqscrollview.h"
+#include "tqscrollview.h"
 #include "tqstylesheet.h"
 #include "tqptrvector.h"
 #include "tqvaluelist.h"
diff --git a/src/widgets/tqtoolbar.cpp b/src/widgets/tqtoolbar.cpp
index a94185bec..b8a66fb7a 100644
--- a/src/widgets/tqtoolbar.cpp
+++ b/src/widgets/tqtoolbar.cpp
@@ -51,7 +51,7 @@
 #include "ntqdrawutil.h"
 #include "tqtoolbutton.h"
 #include "tqpopupmenu.h"
-#include "ntqcombobox.h"
+#include "tqcombobox.h"
 #include "tqtimer.h"
 #include "tqwidgetlist.h"
 #include "tqstyle.h"
diff --git a/src/widgets/tqtoolbox.cpp b/src/widgets/tqtoolbox.cpp
index 7b515b0a7..948acf7d7 100644
--- a/src/widgets/tqtoolbox.cpp
+++ b/src/widgets/tqtoolbox.cpp
@@ -44,7 +44,7 @@
 
 #include <ntqbutton.h>
 #include <ntqlayout.h>
-#include <ntqscrollview.h>
+#include <tqscrollview.h>
 #include <tqpainter.h>
 #include <tqstyle.h>
 #include <tqobjectlist.h>