13 files changed, 31 insertions, 31 deletions
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"