Rename layout nt* related files to equivalent tq*

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

58 files changed, 107 insertions, 107 deletions

diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp
index 2580d9e90..53691afe7 100644
--- a/src/dialogs/qerrormessage.cpp
+++ b/src/dialogs/qerrormessage.cpp
@@ -46,7 +46,7 @@
 #include "tqcheckbox.h"
 #include "tqdict.h"
 #include "tqlabel.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "ntqmessagebox.h"
 #include "tqpushbutton.h"
 #include "tqstringlist.h"
diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp
index 6b16af01d..8d61ec333 100644
--- a/src/dialogs/qinputdialog.cpp
+++ b/src/dialogs/qinputdialog.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_INPUTDIALOG
 
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqlabel.h"
 #include "tqlineedit.h"
 #include "tqpushbutton.h"
diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp
index a47604bdc..16c964f58 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/qprintdialog.cpp
@@ -52,7 +52,7 @@
 #include "tqpushbutton.h"
 #include "tqprinter.h"
 #include "tqlistview.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqbuttongroup.h"
 #include "tqradiobutton.h"
 #include "tqspinbox.h"
diff --git a/src/dialogs/tqcolordialog.cpp b/src/dialogs/tqcolordialog.cpp
index a92f3af5d..56f610036 100644
--- a/src/dialogs/tqcolordialog.cpp
+++ b/src/dialogs/tqcolordialog.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_COLORDIALOG
 
 #include "tqpainter.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqlabel.h"
 #include "tqpushbutton.h"
 #include "tqlineedit.h"
diff --git a/src/dialogs/tqdialog.cpp b/src/dialogs/tqdialog.cpp
index f3f05ae50..1852d6d6a 100644
--- a/src/dialogs/tqdialog.cpp
+++ b/src/dialogs/tqdialog.cpp
@@ -47,7 +47,7 @@
 #include "ntqapplication.h"
 #include "tqobjectlist.h"
 #include "tqwidgetlist.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqsizegrip.h"
 #include "tqwhatsthis.h"
 #include "tqpopupmenu.h"
diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp
index 5ac7307a0..cf4eed715 100644
--- a/src/dialogs/tqfiledialog.cpp
+++ b/src/dialogs/tqfiledialog.cpp
@@ -66,10 +66,10 @@
 #include "tqdragobject.h"
 #include "tqfile.h"
 #include "ntqguardedptr.h"
-#include "ntqhbox.h"
+#include "tqhbox.h"
 #include "tqheader.h"
 #include "tqlabel.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "ntqlibrary.h"
 #include "tqlineedit.h"
 #include "tqlistbox.h"
@@ -91,7 +91,7 @@
 #include "tqtimer.h"
 #include "tqtoolbutton.h"
 #include "tqtooltip.h"
-#include "ntqvbox.h"
+#include "tqvbox.h"
 #include "tqwidgetstack.h"
 
 #ifdef TQ_WS_X11
diff --git a/src/dialogs/tqfontdialog.cpp b/src/dialogs/tqfontdialog.cpp
index 8ea7e9ea0..d7a39390e 100644
--- a/src/dialogs/tqfontdialog.cpp
+++ b/src/dialogs/tqfontdialog.cpp
@@ -49,9 +49,9 @@
 #include "tqpushbutton.h"
 #include "tqcheckbox.h"
 #include "tqcombobox.h"
-#include "ntqlayout.h"
-#include "ntqvgroupbox.h"
-#include "ntqhgroupbox.h"
+#include "tqlayout.h"
+#include "tqvgroupbox.h"
+#include "tqhgroupbox.h"
 #include "tqlabel.h"
 #include "ntqapplication.h"
 #include "tqfontdatabase.h"
diff --git a/src/dialogs/tqtabdialog.cpp b/src/dialogs/tqtabdialog.cpp
index 0d00244e0..f3ae9a744 100644
--- a/src/dialogs/tqtabdialog.cpp
+++ b/src/dialogs/tqtabdialog.cpp
@@ -51,7 +51,7 @@
 #include "ntqapplication.h"
 #include "tqtabwidget.h"
 #include "tqwidgetstack.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 
 /*!
   \class TQTabDialog tqtabdialog.h
diff --git a/src/dialogs/tqwizard.cpp b/src/dialogs/tqwizard.cpp
index 2b4c46682..b7dfa91ce 100644
--- a/src/dialogs/tqwizard.cpp
+++ b/src/dialogs/tqwizard.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_WIZARD
 
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqpushbutton.h"
 #include "ntqcursor.h"
 #include "tqlabel.h"
diff --git a/src/kernel/ntqabstractlayout.h b/src/kernel/ntqabstractlayout.h
index 9d7697629..a28406772 100644
--- a/src/kernel/ntqabstractlayout.h
+++ b/src/kernel/ntqabstractlayout.h
@@ -47,7 +47,7 @@
 
 #ifndef QT_H
 #ifndef TQT_NO_COMPAT
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #endif
 #endif // QT_H
 
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index d9119ed7d..f72ec4e66 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -78,7 +78,7 @@
 #include "tqurlinfo.h"
 #include "tqwidgetlist.h"
 #include <tqcombobox.h>
-#include "ntqgroupbox.h"
+#include "tqgroupbox.h"
 #include "tqdialog.h"
 #include <tqdataview.h>
 #include "ntqdockwindow.h"
@@ -97,9 +97,9 @@
 #include "tqbuttongroup.h"
 #include <tqdatetimeedit.h>
 #include "ntqgvector.h"
-#include "ntqhbox.h"
-#include <ntqhbuttongroup.h>
-#include <ntqhgroupbox.h>
+#include "tqhbox.h"
+#include <tqhbuttongroup.h>
+#include <tqhgroupbox.h>
 #include "tqsocketnotifier.h"
 #include <tqeventloop.h>
 #include <tqhttp.h>
@@ -117,7 +117,7 @@
 #include <ntqkeycode.h>
 #include <ntqaccel.h>
 #include "tqlabel.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include <tqlcdnumber.h>
 #include <ntqlibrary.h>
 #include <ntqinputdialog.h>
@@ -254,9 +254,9 @@
 #include <tqvaluestack.h>
 #include <tqvaluevector.h>
 #include <tqdatatable.h>
-#include <ntqvbox.h>
-#include <ntqvbuttongroup.h>
-#include <ntqvgroupbox.h>
+#include <tqvbox.h>
+#include <tqvbuttongroup.h>
+#include <tqvgroupbox.h>
 #include <tqthread.h>
 #include <tqwhatsthis.h>
 #include <ntqapplication.h>
@@ -278,7 +278,7 @@
 #include "private/qcom_p.h"
 #include "private/tqimageformatinterface_p.h"
 #include "private/tqisciicodec_p.h"
-#include "private/qlayoutengine_p.h"
+#include "private/tqlayoutengine_p.h"
 #include "private/qcomlibrary_p.h"
 #include "private/qeffects_p.h"
 #include "private/qgpluginmanager_p.h"
diff --git a/src/kernel/qabstractlayout.cpp b/src/kernel/qabstractlayout.cpp
index 98ffcd6c8..3f881ddbb 100644
--- a/src/kernel/qabstractlayout.cpp
+++ b/src/kernel/qabstractlayout.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqlayout.h"
+#include "tqlayout.h"
 
 #ifndef TQT_NO_LAYOUT
 #include "ntqapplication.h"
-#include "qlayoutengine_p.h"
+#include "tqlayoutengine_p.h"
 #include "tqmenubar.h"
 #include "tqtoolbar.h"
 
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index 8ef3396df..1032c74eb 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -72,7 +72,7 @@
 #include "tqstylesheet.h"
 #include "tqptrvector.h"
 #include "tqpainter.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqobject.h"
 #include "ntqapplication.h"
 #endif // QT_H
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index 64424b6d6..279ac107b 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -37,8 +37,8 @@ kernel {
 		  $$KERNEL_H/tqimageformatplugin.h \
 		  $$KERNEL_H/ntqkeycode.h \
 		  $$KERNEL_H/ntqkeysequence.h \
-		  $$KERNEL_H/ntqlayout.h \
-		  $$KERNEL_P/qlayoutengine_p.h \
+		  $$KERNEL_H/tqlayout.h \
+		  $$KERNEL_P/tqlayoutengine_p.h \
 		  $$KERNEL_H/tqtranslator.h \
 		  $$KERNEL_H/ntqmetaobject.h \
 		  $$KERNEL_H/tqmime.h \
@@ -218,8 +218,8 @@ kernel {
 		  $$KERNEL_CPP/tqimage.cpp \
 		  $$KERNEL_CPP/tqimageformatplugin.cpp \
 		  $$KERNEL_CPP/qkeysequence.cpp \
-		  $$KERNEL_CPP/qlayout.cpp \
-		  $$KERNEL_CPP/qlayoutengine.cpp \
+		  $$KERNEL_CPP/tqlayout.cpp \
+		  $$KERNEL_CPP/tqlayoutengine.cpp \
 		  $$KERNEL_CPP/tqtranslator.cpp \
 		  $$KERNEL_CPP/qmetaobject.cpp \
 		  $$KERNEL_CPP/tqmime.cpp \
diff --git a/src/kernel/qlayout.cpp b/src/kernel/tqlayout.cpp
index 5697f20e6..bfab60480 100644
--- a/src/kernel/qlayout.cpp
+++ b/src/kernel/tqlayout.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqlayout.h"
+#include "tqlayout.h"
 
 #ifndef TQT_NO_LAYOUT
 
@@ -47,7 +47,7 @@
 #include "tqptrlist.h"
 #include "tqsizepolicy.h"
 
-#include "qlayoutengine_p.h"
+#include "tqlayoutengine_p.h"
 
 /*
   Three internal classes related to TQGridLayout: (1) TQGridBox is a
@@ -1625,7 +1625,7 @@ private:
     the mainWidget()), divides it up into a row of boxes, and makes
     each managed widget fill one box.
 
-    \img qhbox-m.png Horizontal box with five child widgets
+    \img tqhbox-m.png Horizontal box with five child widgets
 
     If the TQBoxLayout's orientation is \c Horizontal the boxes are
     placed in a row, with suitable sizes. Each widget (or other box)
@@ -1633,7 +1633,7 @@ private:
     Any excess space is shared according to the stretch factors (more
     about that below).
 
-    \img qvbox-m.png Vertical box with five child widgets
+    \img tqvbox-m.png Vertical box with five child widgets
 
     If the TQBoxLayout's orientation is \c Vertical, the boxes are
     placed in a column, again with suitable sizes.
@@ -2457,7 +2457,7 @@ void TQBoxLayout::calcHfw( int w )
 	l->addWidget( anotherChildOfWidget );
     \endcode
 
-    \img qhboxlayout.png TQHBox
+    \img tqhboxlayout.png TQHBox
 
     \sa TQVBoxLayout TQGridLayout
 	\link layout.html the Layout overview \endlink
@@ -2533,7 +2533,7 @@ TQHBoxLayout::~TQHBoxLayout()
 	l->addWidget( anotherWidget );
     \endcode
 
-    \img qvboxlayout.png TQVBox
+    \img tqvboxlayout.png TQVBox
 
     \sa TQHBoxLayout TQGridLayout \link layout.html the Layout overview \endlink
 */
diff --git a/src/kernel/ntqlayout.h b/src/kernel/tqlayout.h
index c900c352d..c900c352d 100644
--- a/src/kernel/ntqlayout.h
+++ b/src/kernel/tqlayout.h
diff --git a/src/kernel/qlayoutengine.cpp b/src/kernel/tqlayoutengine.cpp
index 149e04fd7..9eee672e6 100644
--- a/src/kernel/qlayoutengine.cpp
+++ b/src/kernel/tqlayoutengine.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include "ntqlayout.h"
-#include "private/qlayoutengine_p.h"
+#include "tqlayout.h"
+#include "private/tqlayoutengine_p.h"
 
 #ifndef TQT_NO_LAYOUT
 
diff --git a/src/kernel/qlayoutengine_p.h b/src/kernel/tqlayoutengine_p.h
index ed0e950b3..6c1a6aa0f 100644
--- a/src/kernel/qlayoutengine_p.h
+++ b/src/kernel/tqlayoutengine_p.h
@@ -42,7 +42,7 @@
 #define TQLAYOUTENGINE_P_H
 
 #ifndef TQLAYOUT_H
-    #error "Need to include ntqlayout.h before including qlayoutengine_p.h"
+    #error "Need to include tqlayout.h before including tqlayoutengine_p.h"
 #endif
 
 //
@@ -50,7 +50,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qlayout.cpp, qlayoutengine.cpp, tqmainwindow.cpp and qsplitter.cpp.
+// of tqlayout.cpp, tqlayoutengine.cpp, tqmainwindow.cpp and qsplitter.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
diff --git a/src/kernel/tqstyle.cpp b/src/kernel/tqstyle.cpp
index e7e36c06b..dfa1c2cbe 100644
--- a/src/kernel/tqstyle.cpp
+++ b/src/kernel/tqstyle.cpp
@@ -45,7 +45,7 @@
 #include "tqbitmap.h"
 #include "tqpixmapcache.h"
 #include "tqframe.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqlistview.h"
 #include "tqpopupmenu.h"
 #include "tqpushbutton.h"
diff --git a/src/kernel/tqstylesheet.cpp b/src/kernel/tqstylesheet.cpp
index b96ffd963..350c813c8 100644
--- a/src/kernel/tqstylesheet.cpp
+++ b/src/kernel/tqstylesheet.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_RICHTEXT
 
 #include "private/qrichtext_p.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqpainter.h"
 #include "ntqcleanuphandler.h"
 
diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp
index d804f28f1..ddc34c0ec 100644
--- a/src/kernel/tqwidget.cpp
+++ b/src/kernel/tqwidget.cpp
@@ -50,7 +50,7 @@
 #include "ntqapplication.h"
 #include "qapplication_p.h"
 #include "tqbrush.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqstylefactory.h"
 #include "ntqcleanuphandler.h"
 #include "tqstyle.h"
diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index 1d137e943..85367b133 100644
--- a/src/kernel/tqwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -46,7 +46,7 @@
 #include "tqbitmap.h"
 #include "tqimage.h"
 #include "tqobjectlist.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqtextcodec.h"
 #include "tqdatetime.h"
 #include "ntqcursor.h"
diff --git a/src/sql/tqdatatable.cpp b/src/sql/tqdatatable.cpp
index 20aa7a84b..2bcad69ff 100644
--- a/src/sql/tqdatatable.cpp
+++ b/src/sql/tqdatatable.cpp
@@ -46,7 +46,7 @@
 #include "tqsqleditorfactory.h"
 #include "tqsqlpropertymap.h"
 #include "ntqapplication.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqpainter.h"
 #include "tqpopupmenu.h"
 #include "tqvaluelist.h"
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 6e0d1231e..da39e602c 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -60,7 +60,7 @@
 #include "tqheader.h"
 #include "tqspinbox.h"
 #include "ntqrangecontrol.h"
-#include "ntqgroupbox.h"
+#include "tqgroupbox.h"
 #include "tqslider.h"
 #include "tqlistview.h"
 #include "tqcheckbox.h"
diff --git a/src/styles/qmotifplusstyle.cpp b/src/styles/qmotifplusstyle.cpp
index a78df1928..3e4a63010 100644
--- a/src/styles/qmotifplusstyle.cpp
+++ b/src/styles/qmotifplusstyle.cpp
@@ -59,7 +59,7 @@
 #include "tqtabbar.h"
 #include "tqtoolbar.h"
 #include "ntqguardedptr.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 
 
 struct TQMotifPlusStylePrivate
diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h
index f70f61fe5..10a62debd 100644
--- a/src/widgets/ntqdockarea.h
+++ b/src/widgets/ntqdockarea.h
@@ -45,7 +45,7 @@
 #include "tqwidget.h"
 #include "tqptrlist.h"
 #include "ntqdockwindow.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqvaluelist.h"
 #include "ntqguardedptr.h"
 #include "tqtextstream.h"
diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp
index 07ebbaa03..a74fbabb8 100644
--- a/src/widgets/qdockarea.cpp
+++ b/src/widgets/qdockarea.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_MAINWINDOW
 #include "ntqsplitter.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqptrvector.h"
 #include "ntqapplication.h"
 #include "tqpainter.h"
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index 4d0d41141..1c056828e 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -49,7 +49,7 @@
 #include "ntqapplication.h"
 #include "tqtoolbutton.h"
 #include "tqtoolbar.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqmainwindow.h"
 #include "tqtimer.h"
 #include "tqtooltip.h"
diff --git a/src/widgets/qsplitter.cpp b/src/widgets/qsplitter.cpp
index 2a4a193bb..cff76bc50 100644
--- a/src/widgets/qsplitter.cpp
+++ b/src/widgets/qsplitter.cpp
@@ -41,8 +41,8 @@
 #include "ntqsplitter.h"
 #ifndef TQT_NO_SPLITTER
 
-#include "ntqlayout.h"
-#include "../kernel/qlayoutengine_p.h"
+#include "tqlayout.h"
+#include "../kernel/tqlayoutengine_p.h"
 #include "ntqapplication.h"
 #include "tqbitmap.h"
 #include "ntqdrawutil.h"
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index 19cf6d377..7a4e4b3b5 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -15,11 +15,11 @@ widgets {
 		  $$WIDGETS_H/tqframe.h \
 		  $$WIDGETS_H/tqgrid.h \
 		  $$WIDGETS_H/tqgridview.h \
-		  $$WIDGETS_H/ntqgroupbox.h \
-		  $$WIDGETS_H/ntqhbuttongroup.h \
+		  $$WIDGETS_H/tqgroupbox.h \
+		  $$WIDGETS_H/tqhbuttongroup.h \
 		  $$WIDGETS_H/tqheader.h \
-		  $$WIDGETS_H/ntqhgroupbox.h \
-		  $$WIDGETS_H/ntqhbox.h \
+		  $$WIDGETS_H/tqhgroupbox.h \
+		  $$WIDGETS_H/tqhbox.h \
 		  $$WIDGETS_H/tqiconview.h \
 		  $$WIDGETS_H/tqlabel.h \
 		  $$WIDGETS_H/tqlcdnumber.h \
@@ -52,9 +52,9 @@ widgets {
 		  $$WIDGETS_H/tqtoolbutton.h \
 		  $$WIDGETS_H/tqtooltip.h \
 		  $$WIDGETS_H/ntqvalidator.h \
-		  $$WIDGETS_H/ntqvbox.h \
-		  $$WIDGETS_H/ntqvbuttongroup.h \
-		  $$WIDGETS_H/ntqvgroupbox.h \
+		  $$WIDGETS_H/tqvbox.h \
+		  $$WIDGETS_H/tqvbuttongroup.h \
+		  $$WIDGETS_H/tqvgroupbox.h \
 		  $$WIDGETS_H/tqwhatsthis.h \
 		  $$WIDGETS_H/tqwidgetstack.h \
 		  $$WIDGETS_H/tqaction.h \
@@ -77,11 +77,11 @@ widgets {
 		  $$WIDGETS_CPP/tqframe.cpp \
 		  $$WIDGETS_CPP/tqgrid.cpp \
 		  $$WIDGETS_CPP/tqgridview.cpp \
-		  $$WIDGETS_CPP/qgroupbox.cpp \
-		  $$WIDGETS_CPP/qhbuttongroup.cpp \
+		  $$WIDGETS_CPP/tqgroupbox.cpp \
+		  $$WIDGETS_CPP/tqhbuttongroup.cpp \
 		  $$WIDGETS_CPP/tqheader.cpp \
-		  $$WIDGETS_CPP/qhgroupbox.cpp \
-		  $$WIDGETS_CPP/qhbox.cpp \
+		  $$WIDGETS_CPP/tqhgroupbox.cpp \
+		  $$WIDGETS_CPP/tqhbox.cpp \
 		  $$WIDGETS_CPP/tqiconview.cpp \
 		  $$WIDGETS_CPP/tqlabel.cpp \
 		  $$WIDGETS_CPP/tqlcdnumber.cpp \
@@ -114,9 +114,9 @@ widgets {
 		  $$WIDGETS_CPP/tqtoolbutton.cpp \
 		  $$WIDGETS_CPP/tqtooltip.cpp \
 		  $$WIDGETS_CPP/qvalidator.cpp \
-		  $$WIDGETS_CPP/qvbox.cpp \
-		  $$WIDGETS_CPP/qvbuttongroup.cpp \
-		  $$WIDGETS_CPP/qvgroupbox.cpp \
+		  $$WIDGETS_CPP/tqvbox.cpp \
+		  $$WIDGETS_CPP/tqvbuttongroup.cpp \
+		  $$WIDGETS_CPP/tqvgroupbox.cpp \
 		  $$WIDGETS_CPP/tqwhatsthis.cpp \
 		  $$WIDGETS_CPP/tqwidgetstack.cpp \
 		  $$WIDGETS_CPP/tqaction.cpp \
diff --git a/src/widgets/tqbuttongroup.h b/src/widgets/tqbuttongroup.h
index 1eff32887..ee27d9db7 100644
--- a/src/widgets/tqbuttongroup.h
+++ b/src/widgets/tqbuttongroup.h
@@ -42,7 +42,7 @@
 #define TQBUTTONGROUP_H
 
 #ifndef QT_H
-#include "ntqgroupbox.h"
+#include "tqgroupbox.h"
 #endif // QT_H
 
 #ifndef TQT_NO_BUTTONGROUP
diff --git a/src/widgets/tqdialogbuttons.cpp b/src/widgets/tqdialogbuttons.cpp
index b20f70350..939384281 100644
--- a/src/widgets/tqdialogbuttons.cpp
+++ b/src/widgets/tqdialogbuttons.cpp
@@ -47,7 +47,7 @@
 #ifndef TQT_NO_DIALOG
 #include <tqdialog.h>
 #endif // TQT_NO_DIALOG
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqstyle.h>
 #include <tqmap.h>
 
diff --git a/src/widgets/tqgrid.cpp b/src/widgets/tqgrid.cpp
index 0fe3f6949..bdc43f9e1 100644
--- a/src/widgets/tqgrid.cpp
+++ b/src/widgets/tqgrid.cpp
@@ -37,7 +37,7 @@
 
 #include "tqgrid.h"
 #ifndef TQT_NO_GRID
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "ntqapplication.h"
 
 /*!
diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/tqgroupbox.cpp
index 906af0f6f..54b5dd5cf 100644
--- a/src/widgets/qgroupbox.cpp
+++ b/src/widgets/tqgroupbox.cpp
@@ -38,9 +38,9 @@
 **
 **********************************************************************/
 
-#include "ntqgroupbox.h"
+#include "tqgroupbox.h"
 #ifndef TQT_NO_GROUPBOX
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqpainter.h"
 #include "tqbitmap.h"
 #include "ntqaccel.h"
@@ -57,7 +57,7 @@
 #endif
 
 /*!
-    \class TQGroupBox ntqgroupbox.h
+    \class TQGroupBox tqgroupbox.h
     \brief The TQGroupBox widget provides a group box frame with a title.
 
     \ingroup organizers
diff --git a/src/widgets/ntqgroupbox.h b/src/widgets/tqgroupbox.h
index 14198de3e..14198de3e 100644
--- a/src/widgets/ntqgroupbox.h
+++ b/src/widgets/tqgroupbox.h
diff --git a/src/widgets/qhbox.cpp b/src/widgets/tqhbox.cpp
index 7f5e0c893..41b4fabbf 100644
--- a/src/widgets/qhbox.cpp
+++ b/src/widgets/tqhbox.cpp
@@ -34,15 +34,15 @@
 **
 **********************************************************************/
 
-#include "ntqhbox.h"
+#include "tqhbox.h"
 #ifndef TQT_NO_HBOX
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "ntqapplication.h"
 #include "tqobjectlist.h"
 
 
 /*!
-    \class TQHBox ntqhbox.h
+    \class TQHBox tqhbox.h
     \brief The TQHBox widget provides horizontal geometry management
     for its child widgets.
 
@@ -59,7 +59,7 @@
     in proportion to one another. (See \link layout.html
     Layouts\endlink for more information on stretch factors.)
 
-    \img qhbox-m.png TQHBox
+    \img tqhbox-m.png TQHBox
 
     \sa TQHBoxLayout TQVBox TQGrid
 */
diff --git a/src/widgets/ntqhbox.h b/src/widgets/tqhbox.h
index fec6a33cd..fec6a33cd 100644
--- a/src/widgets/ntqhbox.h
+++ b/src/widgets/tqhbox.h
diff --git a/src/widgets/qhbuttongroup.cpp b/src/widgets/tqhbuttongroup.cpp
index 4b5dbf0fc..50e061e51 100644
--- a/src/widgets/qhbuttongroup.cpp
+++ b/src/widgets/tqhbuttongroup.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqhbuttongroup.h"
+#include "tqhbuttongroup.h"
 #ifndef TQT_NO_HBUTTONGROUP
 
 /*!
-    \class TQHButtonGroup ntqhbuttongroup.h
+    \class TQHButtonGroup tqhbuttongroup.h
     \brief The TQHButtonGroup widget organizes TQButton widgets in a
     group with one horizontal row.
 
diff --git a/src/widgets/ntqhbuttongroup.h b/src/widgets/tqhbuttongroup.h
index ab53a0824..ab53a0824 100644
--- a/src/widgets/ntqhbuttongroup.h
+++ b/src/widgets/tqhbuttongroup.h
diff --git a/src/widgets/qhgroupbox.cpp b/src/widgets/tqhgroupbox.cpp
index 1a37a9583..c170d8a4a 100644
--- a/src/widgets/qhgroupbox.cpp
+++ b/src/widgets/tqhgroupbox.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqhgroupbox.h"
+#include "tqhgroupbox.h"
 #ifndef TQT_NO_HGROUPBOX
 
 /*!
-    \class TQHGroupBox ntqhgroupbox.h
+    \class TQHGroupBox tqhgroupbox.h
 
     \brief The TQHGroupBox widget organizes widgets in a group with one
     horizontal row.
@@ -55,7 +55,7 @@
     of TQGroupBox. Think of it as a TQHBox that offers a frame with a
     title.
 
-    \img qgroupboxes.png Group Boxes
+    \img tqgroupboxes.png Group Boxes
 
     \sa TQVGroupBox
 */
diff --git a/src/widgets/ntqhgroupbox.h b/src/widgets/tqhgroupbox.h
index b71776a05..67865c062 100644
--- a/src/widgets/ntqhgroupbox.h
+++ b/src/widgets/tqhgroupbox.h
@@ -42,7 +42,7 @@
 #define TQHGROUPBOX_H
 
 #ifndef QT_H
-#include "ntqgroupbox.h"
+#include "tqgroupbox.h"
 #endif // QT_H
 
 #ifndef TQT_NO_HGROUPBOX
diff --git a/src/widgets/tqiconview.cpp b/src/widgets/tqiconview.cpp
index 6febcfe30..70462bc05 100644
--- a/src/widgets/tqiconview.cpp
+++ b/src/widgets/tqiconview.cpp
@@ -62,7 +62,7 @@
 #include "tqtextedit.h"
 #include "tqmemarray.h"
 #include "tqptrlist.h"
-#include "ntqvbox.h"
+#include "tqvbox.h"
 #include "tqtooltip.h"
 #include "tqbitmap.h"
 #include "tqpixmapcache.h"
diff --git a/src/widgets/tqlistview.cpp b/src/widgets/tqlistview.cpp
index d5b083520..104362f9b 100644
--- a/src/widgets/tqlistview.cpp
+++ b/src/widgets/tqlistview.cpp
@@ -59,7 +59,7 @@
 #include "ntqtl.h"
 #include "tqdragobject.h"
 #include "tqlineedit.h"
-#include "ntqvbox.h"
+#include "tqvbox.h"
 #include "tqtooltip.h"
 #include "tqstyle.h"
 #include "tqstylesheet.h"
diff --git a/src/widgets/tqmainwindow.cpp b/src/widgets/tqmainwindow.cpp
index cda9afcb3..c84e7fe65 100644
--- a/src/widgets/tqmainwindow.cpp
+++ b/src/widgets/tqmainwindow.cpp
@@ -42,7 +42,7 @@
 #ifndef TQT_NO_MAINWINDOW
 
 #include "tqtimer.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqobjectlist.h"
 #include "tqintdict.h"
 #include "ntqapplication.h"
diff --git a/src/widgets/tqmenubar.cpp b/src/widgets/tqmenubar.cpp
index 1f1dc08c5..b288f6280 100644
--- a/src/widgets/tqmenubar.cpp
+++ b/src/widgets/tqmenubar.cpp
@@ -50,7 +50,7 @@
 #include "ntqdrawutil.h"
 #include "ntqapplication.h"
 #include "ntqguardedptr.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "ntqcleanuphandler.h"
 #include "../kernel/qinternal_p.h"
 #include "tqstyle.h"
diff --git a/src/widgets/tqstatusbar.cpp b/src/widgets/tqstatusbar.cpp
index 746f45e5a..29aaadfa1 100644
--- a/src/widgets/tqstatusbar.cpp
+++ b/src/widgets/tqstatusbar.cpp
@@ -42,7 +42,7 @@
 #ifndef TQT_NO_STATUSBAR
 
 #include "tqptrlist.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqpainter.h"
 #include "tqtimer.h"
 #include "ntqdrawutil.h"
diff --git a/src/widgets/tqtextbrowser.cpp b/src/widgets/tqtextbrowser.cpp
index 1409a20ff..504209717 100644
--- a/src/widgets/tqtextbrowser.cpp
+++ b/src/widgets/tqtextbrowser.cpp
@@ -43,14 +43,14 @@
 #include "../kernel/qrichtext_p.h"
 
 #include "ntqapplication.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqpainter.h"
 
 #include "tqvaluestack.h"
 #include "stdio.h"
 #include "tqfile.h"
 #include "tqtextstream.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqbitmap.h"
 #include "tqtimer.h"
 #include "tqimage.h"
diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp
index 304c27172..d57724ab3 100644
--- a/src/widgets/tqtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -60,7 +60,7 @@
 #include "tqtimer.h"
 #include "ntqapplication.h"
 #include "tqlistbox.h"
-#include "ntqvbox.h"
+#include "tqvbox.h"
 #include "ntqapplication.h"
 #include "tqclipboard.h"
 #include "tqcolordialog.h"
diff --git a/src/widgets/tqtoolbar.cpp b/src/widgets/tqtoolbar.cpp
index 99947c59e..27c06fb64 100644
--- a/src/widgets/tqtoolbar.cpp
+++ b/src/widgets/tqtoolbar.cpp
@@ -44,7 +44,7 @@
 #include "tqmainwindow.h"
 #include "tqtooltip.h"
 #include "ntqcursor.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqframe.h"
 #include "tqobjectlist.h"
 #include "tqpainter.h"
diff --git a/src/widgets/tqtoolbox.cpp b/src/widgets/tqtoolbox.cpp
index ad97a79c3..ac9df2f82 100644
--- a/src/widgets/tqtoolbox.cpp
+++ b/src/widgets/tqtoolbox.cpp
@@ -43,14 +43,14 @@
 #ifndef TQT_NO_TOOLBOX
 
 #include <tqbutton.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqscrollview.h>
 #include <tqpainter.h>
 #include <tqstyle.h>
 #include <tqobjectlist.h>
 #include <ntqapplication.h>
 #include <tqwidgetlist.h>
-#include <ntqlayout.h>
+#include <tqlayout.h>
 #include <tqvaluelist.h>
 #include <tqtooltip.h>
 #include <tqeventloop.h>
diff --git a/src/widgets/qvbox.cpp b/src/widgets/tqvbox.cpp
index 8236c1a4f..ad6c7e0b7 100644
--- a/src/widgets/qvbox.cpp
+++ b/src/widgets/tqvbox.cpp
@@ -39,11 +39,11 @@
 **********************************************************************/
 
 
-#include "ntqvbox.h"
+#include "tqvbox.h"
 #ifndef TQT_NO_VBOX
 
 /*!
-    \class TQVBox ntqvbox.h
+    \class TQVBox tqvbox.h
     \brief The TQVBox widget provides vertical geometry management of
     its child widgets.
 
@@ -54,7 +54,7 @@
     All its child widgets will be placed vertically and sized
     according to their sizeHint()s.
 
-    \img qvbox-m.png TQVBox
+    \img tqvbox-m.png TQVBox
 
     \sa TQHBox
 */
diff --git a/src/widgets/ntqvbox.h b/src/widgets/tqvbox.h
index ae1d5fabd..7eed7460f 100644
--- a/src/widgets/ntqvbox.h
+++ b/src/widgets/tqvbox.h
@@ -42,7 +42,7 @@
 #define TQVBOX_H
 
 #ifndef QT_H
-#include "ntqhbox.h"
+#include "tqhbox.h"
 #endif // QT_H
 
 #ifndef TQT_NO_VBOX
diff --git a/src/widgets/qvbuttongroup.cpp b/src/widgets/tqvbuttongroup.cpp
index 06658c18d..312fad1b5 100644
--- a/src/widgets/qvbuttongroup.cpp
+++ b/src/widgets/tqvbuttongroup.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqvbuttongroup.h"
+#include "tqvbuttongroup.h"
 #ifndef TQT_NO_VBUTTONGROUP
 
 /*!
-  \class TQVButtonGroup ntqvbuttongroup.h
+  \class TQVButtonGroup tqvbuttongroup.h
   \brief The TQVButtonGroup widget organizes TQButton widgets in a
   vertical column.
 
diff --git a/src/widgets/ntqvbuttongroup.h b/src/widgets/tqvbuttongroup.h
index a8050bc76..a8050bc76 100644
--- a/src/widgets/ntqvbuttongroup.h
+++ b/src/widgets/tqvbuttongroup.h
diff --git a/src/widgets/qvgroupbox.cpp b/src/widgets/tqvgroupbox.cpp
index de48909bf..468a7e4f1 100644
--- a/src/widgets/qvgroupbox.cpp
+++ b/src/widgets/tqvgroupbox.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqvgroupbox.h"
+#include "tqvgroupbox.h"
 #ifndef TQT_NO_VGROUPBOX
 
 /*!
-  \class TQVGroupBox ntqvgroupbox.h
+  \class TQVGroupBox tqvgroupbox.h
   \brief The TQVGroupBox widget organizes a group of widgets in a
   vertical column.
 
@@ -53,7 +53,7 @@
   TQVGroupBox is a convenience class that offers a thin layer on top of
   TQGroupBox. Think of it as a TQVBox that offers a frame with a title.
 
-  \img qgroupboxes.png Group Boxes
+  \img tqgroupboxes.png Group Boxes
 
   \sa TQHGroupBox
 */
diff --git a/src/widgets/ntqvgroupbox.h b/src/widgets/tqvgroupbox.h
index 4a4505c8e..e98c993d3 100644
--- a/src/widgets/ntqvgroupbox.h
+++ b/src/widgets/tqvgroupbox.h
@@ -42,7 +42,7 @@
 #define TQVGROUPBOX_H
 
 #ifndef QT_H
-#include "ntqgroupbox.h"
+#include "tqgroupbox.h"
 #endif // QT_H
 
 #ifndef TQT_NO_VGROUPBOX
diff --git a/src/widgets/tqwidgetstack.cpp b/src/widgets/tqwidgetstack.cpp
index 6e043943b..5cd6f6254 100644
--- a/src/widgets/tqwidgetstack.cpp
+++ b/src/widgets/tqwidgetstack.cpp
@@ -39,8 +39,8 @@
 **********************************************************************/
 
 #include "tqwidgetstack.h"
-#include "ntqlayout.h"
-#include "../kernel/qlayoutengine_p.h"
+#include "tqlayout.h"
+#include "../kernel/tqlayoutengine_p.h"
 #ifndef TQT_NO_WIDGETSTACK
 
 #include "tqobjectlist.h"
diff --git a/src/workspace/tqworkspace.cpp b/src/workspace/tqworkspace.cpp
index 5706ee3e4..62b8e2732 100644
--- a/src/workspace/tqworkspace.cpp
+++ b/src/workspace/tqworkspace.cpp
@@ -43,10 +43,10 @@
 #include "ntqapplication.h"
 #include "../widgets/qtitlebar_p.h"
 #include "tqobjectlist.h"
-#include "ntqlayout.h"
+#include "tqlayout.h"
 #include "tqtoolbutton.h"
 #include "tqlabel.h"
-#include "ntqvbox.h"
+#include "tqvbox.h"
 #include "ntqaccel.h"
 #include "ntqcursor.h"
 #include "tqpopupmenu.h"