Update to latest tqt3 automated conversion

122 files changed, 797 insertions, 797 deletions

diff --git a/src/widgets/qaction.h b/src/widgets/ntqaction.h
index 6b227b3af..4811d6bfc 100644
--- a/src/widgets/qaction.h
+++ b/src/widgets/ntqaction.h
@@ -42,10 +42,10 @@
 #define TQACTION_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qiconset.h"
-#include "qstring.h"
-#include "qkeysequence.h"
+#include "ntqobject.h"
+#include "ntqiconset.h"
+#include "ntqstring.h"
+#include "ntqkeysequence.h"
 #endif // QT_H
 
 #ifndef QT_NO_ACTION
diff --git a/src/widgets/qbutton.h b/src/widgets/ntqbutton.h
index dceaa0f8d..17dcdd260 100644
--- a/src/widgets/qbutton.h
+++ b/src/widgets/ntqbutton.h
@@ -42,8 +42,8 @@
 #define TQBUTTON_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qkeysequence.h"
+#include "ntqwidget.h"
+#include "ntqkeysequence.h"
 #endif // QT_H
 
 #ifndef QT_NO_BUTTON
diff --git a/src/widgets/qbuttongroup.h b/src/widgets/ntqbuttongroup.h
index edb28aeb7..155c6a763 100644
--- a/src/widgets/qbuttongroup.h
+++ b/src/widgets/ntqbuttongroup.h
@@ -42,7 +42,7 @@
 #define TQBUTTONGROUP_H
 
 #ifndef QT_H
-#include "qgroupbox.h"
+#include "ntqgroupbox.h"
 #endif // QT_H
 
 #ifndef QT_NO_BUTTONGROUP
diff --git a/src/widgets/qcheckbox.h b/src/widgets/ntqcheckbox.h
index 7c0dc9dfb..16a2b7a7a 100644
--- a/src/widgets/qcheckbox.h
+++ b/src/widgets/ntqcheckbox.h
@@ -42,7 +42,7 @@
 #define TQCHECKBOX_H
 
 #ifndef QT_H
-#include "qbutton.h"
+#include "ntqbutton.h"
 #endif // QT_H
 
 #ifndef QT_NO_CHECKBOX
diff --git a/src/widgets/qcombobox.h b/src/widgets/ntqcombobox.h
index f3f073f61..0b5eb95d7 100644
--- a/src/widgets/qcombobox.h
+++ b/src/widgets/ntqcombobox.h
@@ -42,7 +42,7 @@
 #define TQCOMBOBOX_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_COMBOBOX
diff --git a/src/widgets/qdatetimeedit.h b/src/widgets/ntqdatetimeedit.h
index f725149e7..86b8db22b 100644
--- a/src/widgets/qdatetimeedit.h
+++ b/src/widgets/ntqdatetimeedit.h
@@ -42,9 +42,9 @@
 #define TQDATETIMEEDIT_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qstring.h"
-#include "qdatetime.h"
+#include "ntqwidget.h"
+#include "ntqstring.h"
+#include "ntqdatetime.h"
 #endif // QT_H
 
 #ifndef QT_NO_DATETIMEEDIT
diff --git a/src/widgets/qdial.h b/src/widgets/ntqdial.h
index e171a6b07..8fd34772d 100644
--- a/src/widgets/qdial.h
+++ b/src/widgets/ntqdial.h
@@ -43,8 +43,8 @@
 #define TQDIAL_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qrangecontrol.h"
+#include "ntqwidget.h"
+#include "ntqrangecontrol.h"
 #endif // QT_H
 
 #ifndef QT_NO_DIAL
diff --git a/src/widgets/qdockarea.h b/src/widgets/ntqdockarea.h
index ca6391d78..2c68842de 100644
--- a/src/widgets/qdockarea.h
+++ b/src/widgets/ntqdockarea.h
@@ -42,13 +42,13 @@
 #define TQDOCKAREA_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qptrlist.h"
-#include "qdockwindow.h"
-#include "qlayout.h"
-#include "qvaluelist.h"
-#include "qguardedptr.h"
-#include "qtextstream.h"
+#include "ntqwidget.h"
+#include "ntqptrlist.h"
+#include "ntqdockwindow.h"
+#include "ntqlayout.h"
+#include "ntqvaluelist.h"
+#include "ntqguardedptr.h"
+#include "ntqtextstream.h"
 #endif // QT_H
 
 #ifndef QT_NO_MAINWINDOW
@@ -185,7 +185,7 @@ Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQDockArea & );
 #endif
 
 #define Q_DEFINED_QDOCKAREA
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif
 
 #endif //QT_NO_MAINWINDOW
diff --git a/src/widgets/qdockwindow.h b/src/widgets/ntqdockwindow.h
index 57c66bc71..405a507d3 100644
--- a/src/widgets/qdockwindow.h
+++ b/src/widgets/ntqdockwindow.h
@@ -42,7 +42,7 @@
 #define TQDOCKWINDOW_H
 
 #ifndef QT_H
-#include "qframe.h"
+#include "ntqframe.h"
 #endif // QT_H
 
 #ifndef QT_NO_MAINWINDOW
@@ -231,7 +231,7 @@ inline TQDockArea *TQDockWindow::area() const
 }
 
 #define Q_DEFINED_QDOCKWINDOW
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif
 
 #endif // TQDOCKWINDOW_H
diff --git a/src/widgets/qframe.h b/src/widgets/ntqframe.h
index ae174974f..e157ea1ad 100644
--- a/src/widgets/qframe.h
+++ b/src/widgets/ntqframe.h
@@ -42,7 +42,7 @@
 #define TQFRAME_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_FRAME
diff --git a/src/widgets/qgrid.h b/src/widgets/ntqgrid.h
index a1a6508c6..d28eb6d58 100644
--- a/src/widgets/qgrid.h
+++ b/src/widgets/ntqgrid.h
@@ -38,7 +38,7 @@
 #define TQGRID_H
 
 #ifndef QT_H
-#include "qframe.h"
+#include "ntqframe.h"
 #endif // QT_H
 
 #ifndef QT_NO_GRID
diff --git a/src/widgets/qgridview.h b/src/widgets/ntqgridview.h
index d3f3f8c54..5e4cd604c 100644
--- a/src/widgets/qgridview.h
+++ b/src/widgets/ntqgridview.h
@@ -42,7 +42,7 @@
 #define TQGRIDVIEW_H
 
 #ifndef QT_H
-#include "qscrollview.h"
+#include "ntqscrollview.h"
 #endif // QT_H
 
 #ifndef QT_NO_GRIDVIEW
diff --git a/src/widgets/qgroupbox.h b/src/widgets/ntqgroupbox.h
index ed95c5c69..602788c15 100644
--- a/src/widgets/qgroupbox.h
+++ b/src/widgets/ntqgroupbox.h
@@ -42,7 +42,7 @@
 #define TQGROUPBOX_H
 
 #ifndef QT_H
-#include "qframe.h"
+#include "ntqframe.h"
 #endif // QT_H
 
 #ifndef QT_NO_GROUPBOX
diff --git a/src/widgets/qhbox.h b/src/widgets/ntqhbox.h
index 162fa3e61..3d46ee304 100644
--- a/src/widgets/qhbox.h
+++ b/src/widgets/ntqhbox.h
@@ -39,12 +39,12 @@
 #define TQHBOX_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_HBOX
 
-#include "qframe.h"
+#include "ntqframe.h"
 
 class TQBoxLayout;
 
diff --git a/src/widgets/qhbuttongroup.h b/src/widgets/ntqhbuttongroup.h
index 8a6caff78..1f0000897 100644
--- a/src/widgets/qhbuttongroup.h
+++ b/src/widgets/ntqhbuttongroup.h
@@ -42,7 +42,7 @@
 #define TQHBUTTONGROUP_H
 
 #ifndef QT_H
-#include "qbuttongroup.h"
+#include "ntqbuttongroup.h"
 #endif // QT_H
 
 #ifndef QT_NO_HBUTTONGROUP
diff --git a/src/widgets/qheader.h b/src/widgets/ntqheader.h
index 2f5d000e6..4ebe46c94 100644
--- a/src/widgets/qheader.h
+++ b/src/widgets/ntqheader.h
@@ -42,9 +42,9 @@
 #define TQHEADER_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qstring.h"
-#include "qiconset.h" // conversion TQPixmap->TQIconset
+#include "ntqwidget.h"
+#include "ntqstring.h"
+#include "ntqiconset.h" // conversion TQPixmap->TQIconset
 #endif // QT_H
 
 #ifndef QT_NO_HEADER
diff --git a/src/widgets/qhgroupbox.h b/src/widgets/ntqhgroupbox.h
index 9f61a4a34..401432ba2 100644
--- a/src/widgets/qhgroupbox.h
+++ b/src/widgets/ntqhgroupbox.h
@@ -42,7 +42,7 @@
 #define TQHGROUPBOX_H
 
 #ifndef QT_H
-#include "qgroupbox.h"
+#include "ntqgroupbox.h"
 #endif // QT_H
 
 #ifndef QT_NO_HGROUPBOX
diff --git a/src/widgets/qlabel.h b/src/widgets/ntqlabel.h
index 8e1ba94f7..c2d6ca352 100644
--- a/src/widgets/qlabel.h
+++ b/src/widgets/ntqlabel.h
@@ -42,7 +42,7 @@
 #define TQLABEL_H
 
 #ifndef QT_H
-#include "qframe.h"
+#include "ntqframe.h"
 #endif // QT_H
 
 #ifndef QT_NO_LABEL
diff --git a/src/widgets/qlcdnumber.h b/src/widgets/ntqlcdnumber.h
index a872703bc..a936b3e1b 100644
--- a/src/widgets/qlcdnumber.h
+++ b/src/widgets/ntqlcdnumber.h
@@ -42,8 +42,8 @@
 #define TQLCDNUMBER_H
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qbitarray.h"
+#include "ntqframe.h"
+#include "ntqbitarray.h"
 #endif // QT_H
 
 #ifndef QT_NO_LCDNUMBER
diff --git a/src/widgets/qlineedit.h b/src/widgets/ntqlineedit.h
index 73db03d36..dad904b7c 100644
--- a/src/widgets/qlineedit.h
+++ b/src/widgets/ntqlineedit.h
@@ -47,8 +47,8 @@ class TQValidator;
 class TQPopupMenu;
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qstring.h"
+#include "ntqframe.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #ifndef QT_NO_LINEEDIT
diff --git a/src/widgets/qlistbox.h b/src/widgets/ntqlistbox.h
index 385e92b37..a7764791d 100644
--- a/src/widgets/qlistbox.h
+++ b/src/widgets/ntqlistbox.h
@@ -42,8 +42,8 @@
 #define TQLISTBOX_H
 
 #ifndef QT_H
-#include "qscrollview.h"
-#include "qpixmap.h"
+#include "ntqscrollview.h"
+#include "ntqpixmap.h"
 #endif // QT_H
 
 #ifndef QT_NO_LISTBOX
diff --git a/src/widgets/qlistview.h b/src/widgets/ntqlistview.h
index 02abb51ec..61efac96f 100644
--- a/src/widgets/qlistview.h
+++ b/src/widgets/ntqlistview.h
@@ -42,7 +42,7 @@
 #define TQLISTVIEW_H
 
 #ifndef QT_H
-#include "qscrollview.h"
+#include "ntqscrollview.h"
 #endif // QT_H
 
 #ifndef QT_NO_LISTVIEW
diff --git a/src/widgets/qmainwindow.h b/src/widgets/ntqmainwindow.h
index 055259371..14ec3b5e4 100644
--- a/src/widgets/qmainwindow.h
+++ b/src/widgets/ntqmainwindow.h
@@ -42,10 +42,10 @@
 #define TQMAINWINDOW_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qtoolbar.h"
-#include "qptrlist.h"
-#include "qtextstream.h"
+#include "ntqwidget.h"
+#include "ntqtoolbar.h"
+#include "ntqptrlist.h"
+#include "ntqtextstream.h"
 #endif // QT_H
 
 #ifndef QT_NO_MAINWINDOW
diff --git a/src/widgets/qmenubar.h b/src/widgets/ntqmenubar.h
index 2878c3dd5..ae2be8d1e 100644
--- a/src/widgets/qmenubar.h
+++ b/src/widgets/ntqmenubar.h
@@ -42,9 +42,9 @@
 #define TQMENUBAR_H
 
 #ifndef QT_H
-#include "qpopupmenu.h" // ### remove or keep for users' convenience?
-#include "qframe.h"
-#include "qmenudata.h"
+#include "ntqpopupmenu.h" // ### remove or keep for users' convenience?
+#include "ntqframe.h"
+#include "ntqmenudata.h"
 #endif // QT_H
 
 #ifndef QT_NO_MENUBAR
diff --git a/src/widgets/qmenudata.h b/src/widgets/ntqmenudata.h
index 71f9a6cfe..fa6d860ee 100644
--- a/src/widgets/qmenudata.h
+++ b/src/widgets/ntqmenudata.h
@@ -42,12 +42,12 @@
 #define TQMENUDATA_H
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qiconset.h" // conversion TQPixmap->TQIconset
-#include "qkeysequence.h"
-#include "qstring.h"
-#include "qsignal.h"
-#include "qfont.h"
+#include "ntqglobal.h"
+#include "ntqiconset.h" // conversion TQPixmap->TQIconset
+#include "ntqkeysequence.h"
+#include "ntqstring.h"
+#include "ntqsignal.h"
+#include "ntqfont.h"
 #endif // QT_H
 
 #ifndef QT_NO_MENUDATA
@@ -118,7 +118,7 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#include "qptrlist.h"
+#include "ntqptrlist.h"
 typedef TQPtrList<TQMenuItem>	 TQMenuItemList;
 typedef TQPtrListIterator<TQMenuItem> TQMenuItemListIt;
 
diff --git a/src/widgets/qmultilineedit.h b/src/widgets/ntqmultilineedit.h
index 16f36abd1..08b0c9519 100644
--- a/src/widgets/qmultilineedit.h
+++ b/src/widgets/ntqmultilineedit.h
@@ -42,7 +42,7 @@
 #define TQMULTILINEEDIT_H
 
 #ifndef QT_H
-#include "qtextedit.h"
+#include "ntqtextedit.h"
 #endif // QT_H
 
 #ifndef QT_NO_MULTILINEEDIT
diff --git a/src/widgets/qpopupmenu.h b/src/widgets/ntqpopupmenu.h
index 5e7d10f9c..d3b114b1a 100644
--- a/src/widgets/qpopupmenu.h
+++ b/src/widgets/ntqpopupmenu.h
@@ -42,8 +42,8 @@
 #define TQPOPUPMENU_H
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qmenudata.h"
+#include "ntqframe.h"
+#include "ntqmenudata.h"
 #endif // QT_H
 
 #ifndef QT_NO_POPUPMENU
diff --git a/src/widgets/qprogressbar.h b/src/widgets/ntqprogressbar.h
index 76463f1e7..b848235c4 100644
--- a/src/widgets/qprogressbar.h
+++ b/src/widgets/ntqprogressbar.h
@@ -42,7 +42,7 @@
 #define TQPROGRESSBAR_H
 
 #ifndef QT_H
-#include "qframe.h"
+#include "ntqframe.h"
 #endif // QT_H
 
 #ifndef QT_NO_PROGRESSBAR
diff --git a/src/widgets/qpushbutton.h b/src/widgets/ntqpushbutton.h
index 5824802e7..9f74aae31 100644
--- a/src/widgets/qpushbutton.h
+++ b/src/widgets/ntqpushbutton.h
@@ -42,8 +42,8 @@
 #define TQPUSHBUTTON_H
 
 #ifndef QT_H
-#include "qbutton.h"
-#include "qiconset.h"
+#include "ntqbutton.h"
+#include "ntqiconset.h"
 #endif // QT_H
 
 #ifndef QT_NO_PUSHBUTTON
diff --git a/src/widgets/qradiobutton.h b/src/widgets/ntqradiobutton.h
index 6c9546314..9ceb30782 100644
--- a/src/widgets/qradiobutton.h
+++ b/src/widgets/ntqradiobutton.h
@@ -42,7 +42,7 @@
 #define TQRADIOBUTTON_H
 
 #ifndef QT_H
-#include "qbutton.h"
+#include "ntqbutton.h"
 #endif // QT_H
 
 #ifndef QT_NO_RADIOBUTTON
diff --git a/src/widgets/qrangecontrol.h b/src/widgets/ntqrangecontrol.h
index f438ca7aa..940711cce 100644
--- a/src/widgets/qrangecontrol.h
+++ b/src/widgets/ntqrangecontrol.h
@@ -42,8 +42,8 @@
 #define TQRANGECONTROL_H
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qframe.h"
+#include "ntqglobal.h"
+#include "ntqframe.h"
 #endif // QT_H
 
 #ifndef QT_NO_RANGECONTROL
diff --git a/src/widgets/qscrollbar.h b/src/widgets/ntqscrollbar.h
index c3552cf41..be9229015 100644
--- a/src/widgets/qscrollbar.h
+++ b/src/widgets/ntqscrollbar.h
@@ -44,8 +44,8 @@
 class TQTimer;
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qrangecontrol.h"
+#include "ntqwidget.h"
+#include "ntqrangecontrol.h"
 #endif // QT_H
 
 #ifndef QT_NO_SCROLLBAR
diff --git a/src/widgets/qscrollview.h b/src/widgets/ntqscrollview.h
index a935f8e3c..2de0e6a5b 100644
--- a/src/widgets/qscrollview.h
+++ b/src/widgets/ntqscrollview.h
@@ -41,8 +41,8 @@
 #define TQSCROLLVIEW_H
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qscrollbar.h"
+#include "ntqframe.h"
+#include "ntqscrollbar.h"
 #endif // QT_H
 
 #ifndef QT_NO_SCROLLVIEW
diff --git a/src/widgets/qslider.h b/src/widgets/ntqslider.h
index 4d80b4fab..2a87d3bf3 100644
--- a/src/widgets/qslider.h
+++ b/src/widgets/ntqslider.h
@@ -42,8 +42,8 @@
 #define TQSLIDER_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qrangecontrol.h"
+#include "ntqwidget.h"
+#include "ntqrangecontrol.h"
 #endif // QT_H
 
 #ifndef QT_NO_SLIDER
diff --git a/src/widgets/qspinbox.h b/src/widgets/ntqspinbox.h
index 8bb8dc9aa..df4a15421 100644
--- a/src/widgets/qspinbox.h
+++ b/src/widgets/ntqspinbox.h
@@ -42,8 +42,8 @@
 #define TQSPINBOX_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qrangecontrol.h"
+#include "ntqwidget.h"
+#include "ntqrangecontrol.h"
 #endif // QT_H
 
 #ifndef QT_NO_SPINBOX
diff --git a/src/widgets/qsplashscreen.h b/src/widgets/ntqsplashscreen.h
index 9c4660e20..10c4e5c6d 100644
--- a/src/widgets/qsplashscreen.h
+++ b/src/widgets/ntqsplashscreen.h
@@ -40,8 +40,8 @@
 #define TQSPLASHSCREEN_H
 
 #ifndef QT_H
-#include "qpixmap.h"
-#include "qwidget.h"
+#include "ntqpixmap.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_SPLASHSCREEN
diff --git a/src/widgets/qsplitter.h b/src/widgets/ntqsplitter.h
index d614bbbec..8e05120e1 100644
--- a/src/widgets/qsplitter.h
+++ b/src/widgets/ntqsplitter.h
@@ -42,8 +42,8 @@
 #define TQSPLITTER_H
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qvaluelist.h"
+#include "ntqframe.h"
+#include "ntqvaluelist.h"
 #endif // QT_H
 
 #ifndef QT_NO_SPLITTER
diff --git a/src/widgets/qstatusbar.h b/src/widgets/ntqstatusbar.h
index 9591892f0..1402b2ff7 100644
--- a/src/widgets/qstatusbar.h
+++ b/src/widgets/ntqstatusbar.h
@@ -42,7 +42,7 @@
 #define TQSTATUSBAR_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_STATUSBAR
diff --git a/src/widgets/qsyntaxhighlighter.h b/src/widgets/ntqsyntaxhighlighter.h
index 19d16f7c4..344211008 100644
--- a/src/widgets/qsyntaxhighlighter.h
+++ b/src/widgets/ntqsyntaxhighlighter.h
@@ -42,9 +42,9 @@
 #define TQSYNTAXHIGHLIGHTER_H
 
 #ifndef QT_H
-#include "qfont.h"
-#include "qcolor.h"
-#include "qstring.h"
+#include "ntqfont.h"
+#include "ntqcolor.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 class TQTextEdit;
diff --git a/src/widgets/qtabbar.h b/src/widgets/ntqtabbar.h
index 408632a17..5428e4c92 100644
--- a/src/widgets/qtabbar.h
+++ b/src/widgets/ntqtabbar.h
@@ -40,8 +40,8 @@
 #define TQTABBAR_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qptrlist.h"
+#include "ntqwidget.h"
+#include "ntqptrlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_TABBAR
diff --git a/src/widgets/qtabwidget.h b/src/widgets/ntqtabwidget.h
index 9110af889..439eadf0a 100644
--- a/src/widgets/qtabwidget.h
+++ b/src/widgets/ntqtabwidget.h
@@ -42,8 +42,8 @@
 #define TQTABWIDGET_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qiconset.h"
+#include "ntqwidget.h"
+#include "ntqiconset.h"
 #endif // QT_H
 
 #ifndef QT_NO_TABWIDGET
diff --git a/src/widgets/qtextbrowser.h b/src/widgets/ntqtextbrowser.h
index 12f8fb833..c9a3e5f58 100644
--- a/src/widgets/qtextbrowser.h
+++ b/src/widgets/ntqtextbrowser.h
@@ -42,10 +42,10 @@
 #define TQTEXTBROWSER_H
 
 #ifndef QT_H
-#include "qptrlist.h"
-#include "qpixmap.h"
-#include "qcolor.h"
-#include "qtextedit.h"
+#include "ntqptrlist.h"
+#include "ntqpixmap.h"
+#include "ntqcolor.h"
+#include "ntqtextedit.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTBROWSER
diff --git a/src/widgets/qtextedit.h b/src/widgets/ntqtextedit.h
index ac334a58e..b3e28463d 100644
--- a/src/widgets/qtextedit.h
+++ b/src/widgets/ntqtextedit.h
@@ -42,11 +42,11 @@
 #define TQTEXTEDIT_H
 
 #ifndef QT_H
-#include "qscrollview.h"
-#include "qstylesheet.h"
-#include "qptrvector.h"
-#include "qvaluelist.h"
-#include "qptrlist.h"
+#include "ntqscrollview.h"
+#include "ntqstylesheet.h"
+#include "ntqptrvector.h"
+#include "ntqvaluelist.h"
+#include "ntqptrlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTEDIT
diff --git a/src/widgets/qtextview.h b/src/widgets/ntqtextview.h
index 75c7c3a1d..71c568564 100644
--- a/src/widgets/qtextview.h
+++ b/src/widgets/ntqtextview.h
@@ -42,7 +42,7 @@
 #define TQTEXTVIEW_H
 
 #ifndef QT_H
-#include "qtextedit.h"
+#include "ntqtextedit.h"
 #endif // QT_H
 
 #ifndef QT_NO_TEXTVIEW
diff --git a/src/widgets/qtoolbar.h b/src/widgets/ntqtoolbar.h
index 894f2afab..f8237f3af 100644
--- a/src/widgets/qtoolbar.h
+++ b/src/widgets/ntqtoolbar.h
@@ -42,7 +42,7 @@
 #define TQTOOLBAR_H
 
 #ifndef QT_H
-#include "qdockwindow.h"
+#include "ntqdockwindow.h"
 #endif // QT_H
 
 #ifndef QT_NO_TOOLBAR
diff --git a/src/widgets/qtoolbox.h b/src/widgets/ntqtoolbox.h
index 717200be5..07e128e16 100644
--- a/src/widgets/qtoolbox.h
+++ b/src/widgets/ntqtoolbox.h
@@ -42,8 +42,8 @@
 #define TQTOOLBOX_H
 
 #ifndef QT_H
-#include <qframe.h>
-#include <qiconset.h>
+#include <ntqframe.h>
+#include <ntqiconset.h>
 #endif // QT_H
 
 #ifndef QT_NO_TOOLBOX
diff --git a/src/widgets/qtoolbutton.h b/src/widgets/ntqtoolbutton.h
index ce187e8a5..ac2c2df45 100644
--- a/src/widgets/qtoolbutton.h
+++ b/src/widgets/ntqtoolbutton.h
@@ -42,10 +42,10 @@
 #define TQTOOLBUTTON_H
 
 #ifndef QT_H
-#include "qbutton.h"
-#include "qstring.h"
-#include "qpixmap.h"
-#include "qiconset.h"
+#include "ntqbutton.h"
+#include "ntqstring.h"
+#include "ntqpixmap.h"
+#include "ntqiconset.h"
 #endif // QT_H
 
 #ifndef QT_NO_TOOLBUTTON
diff --git a/src/widgets/qtooltip.h b/src/widgets/ntqtooltip.h
index 37f91e5f2..55b3817b1 100644
--- a/src/widgets/qtooltip.h
+++ b/src/widgets/ntqtooltip.h
@@ -40,7 +40,7 @@
 #define TQTOOLTIP_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_TOOLTIP
diff --git a/src/widgets/qvalidator.h b/src/widgets/ntqvalidator.h
index b24c94989..04902acd4 100644
--- a/src/widgets/qvalidator.h
+++ b/src/widgets/ntqvalidator.h
@@ -42,9 +42,9 @@
 #define TQVALIDATOR_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qstring.h" // char*->TQString conversion
-#include "qregexp.h" // TQString->TQRegExp conversion
+#include "ntqobject.h"
+#include "ntqstring.h" // char*->TQString conversion
+#include "ntqregexp.h" // TQString->TQRegExp conversion
 #endif // QT_H
 
 #ifndef QT_NO_VALIDATOR
diff --git a/src/widgets/qvbox.h b/src/widgets/ntqvbox.h
index 3558997c1..740a2811c 100644
--- a/src/widgets/qvbox.h
+++ b/src/widgets/ntqvbox.h
@@ -42,7 +42,7 @@
 #define TQVBOX_H
 
 #ifndef QT_H
-#include "qhbox.h"
+#include "ntqhbox.h"
 #endif // QT_H
 
 #ifndef QT_NO_VBOX
diff --git a/src/widgets/qvbuttongroup.h b/src/widgets/ntqvbuttongroup.h
index 8f17ce1c4..41d3c263c 100644
--- a/src/widgets/qvbuttongroup.h
+++ b/src/widgets/ntqvbuttongroup.h
@@ -42,7 +42,7 @@
 #define TQVBUTTONGROUP_H
 
 #ifndef QT_H
-#include "qbuttongroup.h"
+#include "ntqbuttongroup.h"
 #endif // QT_H
 
 #ifndef QT_NO_VBUTTONGROUP
diff --git a/src/widgets/qvgroupbox.h b/src/widgets/ntqvgroupbox.h
index e00db426e..f93158af4 100644
--- a/src/widgets/qvgroupbox.h
+++ b/src/widgets/ntqvgroupbox.h
@@ -42,7 +42,7 @@
 #define TQVGROUPBOX_H
 
 #ifndef QT_H
-#include "qgroupbox.h"
+#include "ntqgroupbox.h"
 #endif // QT_H
 
 #ifndef QT_NO_VGROUPBOX
diff --git a/src/widgets/qwhatsthis.h b/src/widgets/ntqwhatsthis.h
index 365e673c6..e4cda6c1d 100644
--- a/src/widgets/qwhatsthis.h
+++ b/src/widgets/ntqwhatsthis.h
@@ -40,12 +40,12 @@
 #define TQWHATSTHIS_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 #ifndef QT_NO_WHATSTHIS
 
-#include "qcursor.h"
+#include "ntqcursor.h"
 
 class TQToolButton;
 class TQPopupMenu;
diff --git a/src/widgets/qwidgetplugin.h b/src/widgets/ntqwidgetplugin.h
index 0163e00fd..d53bdd962 100644
--- a/src/widgets/qwidgetplugin.h
+++ b/src/widgets/ntqwidgetplugin.h
@@ -42,9 +42,9 @@
 #define TQWIDGETPLUGIN_H
 
 #ifndef QT_H
-#include "qgplugin.h"
-#include "qstringlist.h"
-#include "qiconset.h"
+#include "ntqgplugin.h"
+#include "ntqstringlist.h"
+#include "ntqiconset.h"
 #endif // QT_H
 #ifndef QT_NO_WIDGETPLUGIN
 
diff --git a/src/widgets/qwidgetstack.h b/src/widgets/ntqwidgetstack.h
index 466ce2cb3..bbb4275fb 100644
--- a/src/widgets/qwidgetstack.h
+++ b/src/widgets/ntqwidgetstack.h
@@ -42,9 +42,9 @@
 #define TQWIDGETSTACK_H
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qintdict.h"
-#include "qptrdict.h"
+#include "ntqframe.h"
+#include "ntqintdict.h"
+#include "ntqptrdict.h"
 #endif // QT_H
 
 #ifndef QT_NO_WIDGETSTACK
diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp
index 645e8e581..54eb894a1 100644
--- a/src/widgets/qaction.cpp
+++ b/src/widgets/qaction.cpp
@@ -36,24 +36,24 @@
 **
 **********************************************************************/
 
-#include "qaction.h"
+#include "ntqaction.h"
 
 #ifndef QT_NO_ACTION
 
-#include "qtoolbar.h"
-#include "qptrlist.h"
-#include "qpopupmenu.h"
-#include "qaccel.h"
-#include "qtoolbutton.h"
-#include "qcombobox.h"
-#include "qtooltip.h"
-#include "qwhatsthis.h"
-#include "qstatusbar.h"
-#include "qobjectlist.h"
+#include "ntqtoolbar.h"
+#include "ntqptrlist.h"
+#include "ntqpopupmenu.h"
+#include "ntqaccel.h"
+#include "ntqtoolbutton.h"
+#include "ntqcombobox.h"
+#include "ntqtooltip.h"
+#include "ntqwhatsthis.h"
+#include "ntqstatusbar.h"
+#include "ntqobjectlist.h"
 
 
 /*!
-    \class TQAction qaction.h
+    \class TQAction ntqaction.h
     \brief The TQAction class provides an abstract user interface
     action that can appear both in menus and tool bars.
 
@@ -1376,7 +1376,7 @@ void TQActionGroupPrivate::update( const TQActionGroup* that )
 }
 
 /*!
-    \class TQActionGroup qaction.h
+    \class TQActionGroup ntqaction.h
     \brief The TQActionGroup class groups actions together.
 
     \ingroup basic
diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp
index 220dba2fe..a34486808 100644
--- a/src/widgets/qbutton.cpp
+++ b/src/widgets/qbutton.cpp
@@ -39,22 +39,22 @@
 **********************************************************************/
 
 #undef QT_NO_COMPAT
-#include "qbutton.h"
+#include "ntqbutton.h"
 #ifndef QT_NO_BUTTON
-#include "qbuttongroup.h"
-#include "qbitmap.h"
-#include "qpainter.h"
-#include "qtimer.h"
-#include "qaccel.h"
-#include "qpixmapcache.h"
-#include "qapplication.h"
-#include "qpushbutton.h"
-#include "qradiobutton.h"
-#include "qguardedptr.h"
+#include "ntqbuttongroup.h"
+#include "ntqbitmap.h"
+#include "ntqpainter.h"
+#include "ntqtimer.h"
+#include "ntqaccel.h"
+#include "ntqpixmapcache.h"
+#include "ntqapplication.h"
+#include "ntqpushbutton.h"
+#include "ntqradiobutton.h"
+#include "ntqguardedptr.h"
 #include "../kernel/qinternal_p.h"
 
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 #define AUTO_REPEAT_DELAY  300
@@ -127,7 +127,7 @@ TQTimer *TQButton::timer()
 
 
 /*!
-    \class TQButton qbutton.h
+    \class TQButton ntqbutton.h
     \brief The TQButton class is the abstract base class of button
     widgets, providing functionality common to buttons.
 
diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/qbuttongroup.cpp
index b8aa7c85c..17bcd200b 100644
--- a/src/widgets/qbuttongroup.cpp
+++ b/src/widgets/qbuttongroup.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qbuttongroup.h"
+#include "ntqbuttongroup.h"
 #ifndef QT_NO_BUTTONGROUP
-#include "qbutton.h"
-#include "qptrlist.h"
-#include "qapplication.h"
-#include "qradiobutton.h"
+#include "ntqbutton.h"
+#include "ntqptrlist.h"
+#include "ntqapplication.h"
+#include "ntqradiobutton.h"
 
 
 
 /*!
-    \class TQButtonGroup qbuttongroup.h
+    \class TQButtonGroup ntqbuttongroup.h
     \brief The TQButtonGroup widget organizes TQButton widgets in a group.
 
     \ingroup organizers
diff --git a/src/widgets/qcheckbox.cpp b/src/widgets/qcheckbox.cpp
index 7b63674fd..b4982a167 100644
--- a/src/widgets/qcheckbox.cpp
+++ b/src/widgets/qcheckbox.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qcheckbox.h"
+#include "ntqcheckbox.h"
 #ifndef QT_NO_CHECKBOX
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qpixmapcache.h"
-#include "qbitmap.h"
-#include "qtextstream.h"
-#include "qapplication.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqpixmapcache.h"
+#include "ntqbitmap.h"
+#include "ntqtextstream.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
 
 /*!
-    \class TQCheckBox qcheckbox.h
+    \class TQCheckBox ntqcheckbox.h
     \brief The TQCheckBox widget provides a checkbox with a text label.
 
     \ingroup basic
diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp
index 1e12906f4..59fa0244b 100644
--- a/src/widgets/qcombobox.cpp
+++ b/src/widgets/qcombobox.cpp
@@ -38,29 +38,29 @@
 **
 **********************************************************************/
 
-#include "qcombobox.h"
+#include "ntqcombobox.h"
 #ifndef QT_NO_COMBOBOX
-#include "qpopupmenu.h"
-#include "qlistbox.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qstrlist.h"
-#include "qpixmap.h"
-#include "qtimer.h"
-#include "qapplication.h"
-#include "qlineedit.h"
-#include "qbitmap.h"
+#include "ntqpopupmenu.h"
+#include "ntqlistbox.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqstrlist.h"
+#include "ntqpixmap.h"
+#include "ntqtimer.h"
+#include "ntqapplication.h"
+#include "ntqlineedit.h"
+#include "ntqbitmap.h"
 #include "qeffects_p.h"
-#include "qstringlist.h"
-#include "qcombobox.h"
-#include "qstyle.h"
+#include "ntqstringlist.h"
+#include "ntqcombobox.h"
+#include "ntqstyle.h"
 #include <limits.h>
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 /*!
-    \class TQComboBox qcombobox.h
+    \class TQComboBox ntqcombobox.h
     \brief The TQComboBox widget is a combined button and popup list.
 
     \ingroup basic
diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp
index 9f82aa519..6a8d274c6 100644
--- a/src/widgets/qdatetimeedit.cpp
+++ b/src/widgets/qdatetimeedit.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qdatetimeedit.h"
+#include "ntqdatetimeedit.h"
 
 #ifndef QT_NO_DATETIMEEDIT
 
 #include "../kernel/qinternal_p.h"
 #include "../kernel/qrichtext_p.h"
-#include "qrangecontrol.h"
-#include "qapplication.h"
-#include "qpixmap.h"
-#include "qapplication.h"
-#include "qvaluelist.h"
-#include "qstring.h"
-#include "qstyle.h"
+#include "ntqrangecontrol.h"
+#include "ntqapplication.h"
+#include "ntqpixmap.h"
+#include "ntqapplication.h"
+#include "ntqvaluelist.h"
+#include "ntqstring.h"
+#include "ntqstyle.h"
 
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
@@ -845,7 +845,7 @@ public:
 
 
 /*!
-    \class TQDateEdit qdatetimeedit.h
+    \class TQDateEdit ntqdatetimeedit.h
     \brief The TQDateEdit class provides a date editor.
 
     \ingroup advanced
@@ -1781,7 +1781,7 @@ public:
 };
 
 /*!
-    \class TQTimeEdit qdatetimeedit.h
+    \class TQTimeEdit ntqdatetimeedit.h
     \brief The TQTimeEdit class provides a time editor.
 
     \ingroup advanced
@@ -2600,7 +2600,7 @@ public:
 };
 
 /*!
-    \class TQDateTimeEdit qdatetimeedit.h
+    \class TQDateTimeEdit ntqdatetimeedit.h
     \brief The TQDateTimeEdit class combines a TQDateEdit and TQTimeEdit
     widget into a single widget for editing datetimes.
 
diff --git a/src/widgets/qdial.cpp b/src/widgets/qdial.cpp
index b7736f5eb..683a634f7 100644
--- a/src/widgets/qdial.cpp
+++ b/src/widgets/qdial.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qdial.h"
+#include "ntqdial.h"
 
 #ifndef QT_NO_DIAL
 
-#include "qpainter.h"
-#include "qpointarray.h"
-#include "qcolor.h"
-#include "qapplication.h"
-#include "qregion.h"
-#include "qbitmap.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqpointarray.h"
+#include "ntqcolor.h"
+#include "ntqapplication.h"
+#include "ntqregion.h"
+#include "ntqbitmap.h"
+#include "ntqstyle.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 #include <math.h> // sin(), cos(), atan()
@@ -87,7 +87,7 @@ public:
 
 
 /*!
-    \class TQDial qdial.h
+    \class TQDial ntqdial.h
 
     \brief The TQDial class provides a rounded range control (like a speedometer or potentiometer).
 
diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/qdialogbuttons.cpp
index d87288dc8..2aad8a193 100644
--- a/src/widgets/qdialogbuttons.cpp
+++ b/src/widgets/qdialogbuttons.cpp
@@ -39,17 +39,17 @@
 #include "qdialogbuttons_p.h"
 #ifndef QT_NO_DIALOGBUTTONS
 
-#include <qapplication.h>
-#include <qpushbutton.h>
-#include <qguardedptr.h>
-#include <qmap.h>
-#include <qvariant.h>
+#include <ntqapplication.h>
+#include <ntqpushbutton.h>
+#include <ntqguardedptr.h>
+#include <ntqmap.h>
+#include <ntqvariant.h>
 #ifndef QT_NO_DIALOG
-#include <qdialog.h>
+#include <ntqdialog.h>
 #endif // QT_NO_DIALOG
-#include <qlayout.h>
-#include <qstyle.h>
-#include <qmap.h>
+#include <ntqlayout.h>
+#include <ntqstyle.h>
+#include <ntqmap.h>
 
 struct TQDialogButtonsPrivate
 {
diff --git a/src/widgets/qdialogbuttons_p.h b/src/widgets/qdialogbuttons_p.h
index 6422eed9d..f6ecb3784 100644
--- a/src/widgets/qdialogbuttons_p.h
+++ b/src/widgets/qdialogbuttons_p.h
@@ -41,7 +41,7 @@
 
 #ifndef QT_H
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 #endif
 
diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp
index 767214c7e..cd56be0b3 100644
--- a/src/widgets/qdockarea.cpp
+++ b/src/widgets/qdockarea.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qdockarea.h"
+#include "ntqdockarea.h"
 
 #ifndef QT_NO_MAINWINDOW
-#include "qsplitter.h"
-#include "qlayout.h"
-#include "qptrvector.h"
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qwidgetlist.h"
-#include "qmap.h"
-#include "qmainwindow.h"
+#include "ntqsplitter.h"
+#include "ntqlayout.h"
+#include "ntqptrvector.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqwidgetlist.h"
+#include "ntqmap.h"
+#include "ntqmainwindow.h"
 
 //#define TQDOCKAREA_DEBUG
 
@@ -451,7 +451,7 @@ int TQDockAreaLayout::widthForHeight( int h ) const
 
 
 /*!
-    \class TQDockArea qdockarea.h
+    \class TQDockArea ntqdockarea.h
     \brief The TQDockArea class manages and lays out TQDockWindows.
 
     \ingroup application
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index 82fba58a7..867d64a7b 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -38,24 +38,24 @@
 **
 **********************************************************************/
 
-#include "qdockwindow.h"
+#include "ntqdockwindow.h"
 
 #ifndef QT_NO_MAINWINDOW
-#include "qdesktopwidget.h"
-#include "qdockarea.h"
+#include "ntqdesktopwidget.h"
+#include "ntqdockarea.h"
 #include "qwidgetresizehandler_p.h"
 #include "qtitlebar_p.h"
-#include "qpainter.h"
-#include "qapplication.h"
-#include "qtoolbutton.h"
-#include "qtoolbar.h"
-#include "qlayout.h"
-#include "qmainwindow.h"
-#include "qtimer.h"
-#include "qtooltip.h"
-#include "qguardedptr.h"
-#include "qcursor.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqapplication.h"
+#include "ntqtoolbutton.h"
+#include "ntqtoolbar.h"
+#include "ntqlayout.h"
+#include "ntqmainwindow.h"
+#include "ntqtimer.h"
+#include "ntqtooltip.h"
+#include "ntqguardedptr.h"
+#include "ntqcursor.h"
+#include "ntqstyle.h"
 
 #if defined(Q_WS_MAC9)
 #define MAC_DRAG_HACK
@@ -702,7 +702,7 @@ void TQDockWindowTitleBar::mouseDoubleClickEvent( TQMouseEvent * )
 }
 
 /*!
-    \class TQDockWindow qdockwindow.h
+    \class TQDockWindow ntqdockwindow.h
     \brief The TQDockWindow class provides a widget which can be docked
     inside a TQDockArea or floated as a top level window on the
     desktop.
@@ -793,7 +793,7 @@ void TQDockWindowTitleBar::mouseDoubleClickEvent( TQMouseEvent * )
     A dock window can have some preferred settings, for example, you
     can set a preferred offset from the left edge (or top edge for
     vertical dock areas) of the dock area using setOffset(). If you'd
-    prefer a dock window to start on a new \link qdockarea.html#lines
+    prefer a dock window to start on a new \link ntqdockarea.html#lines
     line\endlink when it is docked use setNewLine(). The
     setFixedExtentWidth() and setFixedExtentHeight() functions can be
     used to define the dock window's preferred size, and the
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index 47393ac56..0e5cf7846 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 #ifndef QT_NO_EFFECTS
-#include "qwidget.h"
+#include "ntqwidget.h"
 #include "qeffects_p.h"
-#include "qpixmap.h"
-#include "qimage.h"
-#include "qtimer.h"
-#include "qdatetime.h"
-#include "qguardedptr.h"
-#include "qscrollview.h"
+#include "ntqpixmap.h"
+#include "ntqimage.h"
+#include "ntqtimer.h"
+#include "ntqdatetime.h"
+#include "ntqguardedptr.h"
+#include "ntqscrollview.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 41de77214..aecfe423d 100644
--- a/src/widgets/qeffects_p.h
+++ b/src/widgets/qeffects_p.h
@@ -56,7 +56,7 @@
 //
 
 #ifndef QT_H
-#include "qnamespace.h"
+#include "ntqnamespace.h"
 #endif // QT_H
 
 #ifndef QT_NO_EFFECTS
diff --git a/src/widgets/qframe.cpp b/src/widgets/qframe.cpp
index a820f6cb6..2af74737c 100644
--- a/src/widgets/qframe.cpp
+++ b/src/widgets/qframe.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qframe.h"
+#include "ntqframe.h"
 #ifndef QT_NO_FRAME
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qframe.h"
-#include "qbitmap.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqframe.h"
+#include "ntqbitmap.h"
+#include "ntqstyle.h"
 
 /*!
     \class TQFrame
diff --git a/src/widgets/qgrid.cpp b/src/widgets/qgrid.cpp
index d0584418c..97ab089e0 100644
--- a/src/widgets/qgrid.cpp
+++ b/src/widgets/qgrid.cpp
@@ -35,13 +35,13 @@
 **********************************************************************/
 
 
-#include "qgrid.h"
+#include "ntqgrid.h"
 #ifndef QT_NO_GRID
-#include "qlayout.h"
-#include "qapplication.h"
+#include "ntqlayout.h"
+#include "ntqapplication.h"
 
 /*!
-    \class TQGrid qgrid.h
+    \class TQGrid ntqgrid.h
     \brief The TQGrid widget provides simple geometry management of its children.
 
     \ingroup geomanagement
diff --git a/src/widgets/qgridview.cpp b/src/widgets/qgridview.cpp
index 146c31b97..e854d3dfe 100644
--- a/src/widgets/qgridview.cpp
+++ b/src/widgets/qgridview.cpp
@@ -39,14 +39,14 @@
 **********************************************************************/
 
 
-#include "qgridview.h"
+#include "ntqgridview.h"
 
 #ifndef QT_NO_GRIDVIEW
 
-#include "qpainter.h"
+#include "ntqpainter.h"
 
 /*!
-    \class TQGridView qgridview.h
+    \class TQGridView ntqgridview.h
     \brief The TQGridView class provides an abstract base for
     fixed-size grids.
 
diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/qgroupbox.cpp
index 05f88387f..e6d2ad583 100644
--- a/src/widgets/qgroupbox.cpp
+++ b/src/widgets/qgroupbox.cpp
@@ -38,26 +38,26 @@
 **
 **********************************************************************/
 
-#include "qgroupbox.h"
+#include "ntqgroupbox.h"
 #ifndef QT_NO_GROUPBOX
-#include "qlayout.h"
-#include "qpainter.h"
-#include "qbitmap.h"
-#include "qaccel.h"
-#include "qradiobutton.h"
-#include "qfocusdata.h"
-#include "qobjectlist.h"
-#include "qdrawutil.h"
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qcheckbox.h"
-#include "qbuttongroup.h"
+#include "ntqlayout.h"
+#include "ntqpainter.h"
+#include "ntqbitmap.h"
+#include "ntqaccel.h"
+#include "ntqradiobutton.h"
+#include "ntqfocusdata.h"
+#include "ntqobjectlist.h"
+#include "ntqdrawutil.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqcheckbox.h"
+#include "ntqbuttongroup.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 /*!
-    \class TQGroupBox qgroupbox.h
+    \class TQGroupBox ntqgroupbox.h
     \brief The TQGroupBox widget provides a group box frame with a title.
 
     \ingroup organizers
diff --git a/src/widgets/qhbox.cpp b/src/widgets/qhbox.cpp
index cda81fd90..89465fd4f 100644
--- a/src/widgets/qhbox.cpp
+++ b/src/widgets/qhbox.cpp
@@ -34,15 +34,15 @@
 **
 **********************************************************************/
 
-#include "qhbox.h"
+#include "ntqhbox.h"
 #ifndef QT_NO_HBOX
-#include "qlayout.h"
-#include "qapplication.h"
-#include "qobjectlist.h"
+#include "ntqlayout.h"
+#include "ntqapplication.h"
+#include "ntqobjectlist.h"
 
 
 /*!
-    \class TQHBox qhbox.h
+    \class TQHBox ntqhbox.h
     \brief The TQHBox widget provides horizontal geometry management
     for its child widgets.
 
diff --git a/src/widgets/qhbuttongroup.cpp b/src/widgets/qhbuttongroup.cpp
index f8f48d95b..2a72f76e3 100644
--- a/src/widgets/qhbuttongroup.cpp
+++ b/src/widgets/qhbuttongroup.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qhbuttongroup.h"
+#include "ntqhbuttongroup.h"
 #ifndef QT_NO_HBUTTONGROUP
 
 /*!
-    \class TQHButtonGroup qhbuttongroup.h
+    \class TQHButtonGroup ntqhbuttongroup.h
     \brief The TQHButtonGroup widget organizes TQButton widgets in a
     group with one horizontal row.
 
diff --git a/src/widgets/qheader.cpp b/src/widgets/qheader.cpp
index 6925d10d4..e20fd3349 100644
--- a/src/widgets/qheader.cpp
+++ b/src/widgets/qheader.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qheader.h"
+#include "ntqheader.h"
 #ifndef QT_NO_HEADER
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qbitarray.h"
-#include "qptrvector.h"
-#include "qapplication.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqbitarray.h"
+#include "ntqptrvector.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
 
 class TQHeaderData
 {
@@ -136,7 +136,7 @@ public:
 
 
 /*!
-    \class TQHeader qheader.h
+    \class TQHeader ntqheader.h
     \brief The TQHeader class provides a header row or column, e.g. for
     tables and listviews.
 
diff --git a/src/widgets/qhgroupbox.cpp b/src/widgets/qhgroupbox.cpp
index b06061e06..79324ee58 100644
--- a/src/widgets/qhgroupbox.cpp
+++ b/src/widgets/qhgroupbox.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qhgroupbox.h"
+#include "ntqhgroupbox.h"
 #ifndef QT_NO_HGROUPBOX
 
 /*!
-    \class TQHGroupBox qhgroupbox.h
+    \class TQHGroupBox ntqhgroupbox.h
 
     \brief The TQHGroupBox widget organizes widgets in a group with one
     horizontal row.
diff --git a/src/widgets/qlabel.cpp b/src/widgets/qlabel.cpp
index 73e913dfe..c78b99104 100644
--- a/src/widgets/qlabel.cpp
+++ b/src/widgets/qlabel.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qlabel.h"
+#include "ntqlabel.h"
 #ifndef QT_NO_LABEL
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qaccel.h"
-#include "qmovie.h"
-#include "qimage.h"
-#include "qbitmap.h"
-#include "qpicture.h"
-#include "qapplication.h"
-#include "qsimplerichtext.h"
-#include "qstylesheet.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqaccel.h"
+#include "ntqmovie.h"
+#include "ntqimage.h"
+#include "ntqbitmap.h"
+#include "ntqpicture.h"
+#include "ntqapplication.h"
+#include "ntqsimplerichtext.h"
+#include "ntqstylesheet.h"
+#include "ntqstyle.h"
 
 class TQLabelPrivate
 {
@@ -67,7 +67,7 @@ public:
 
 
 /*!
-    \class TQLabel qlabel.h
+    \class TQLabel ntqlabel.h
     \brief The TQLabel widget provides a text or image display.
 
     \ingroup basic
diff --git a/src/widgets/qlcdnumber.cpp b/src/widgets/qlcdnumber.cpp
index 4937c907c..99eddf56d 100644
--- a/src/widgets/qlcdnumber.cpp
+++ b/src/widgets/qlcdnumber.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qlcdnumber.h"
+#include "ntqlcdnumber.h"
 #ifndef QT_NO_LCDNUMBER
-#include "qbitarray.h"
-#include "qpainter.h"
+#include "ntqbitarray.h"
+#include "ntqpainter.h"
 
 
 /*!
-    \class TQLCDNumber qlcdnumber.h
+    \class TQLCDNumber ntqlcdnumber.h
 
     \brief The TQLCDNumber widget displays a number with LCD-like digits.
 
diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp
index 2a4ef1c47..74976e2ef 100644
--- a/src/widgets/qlineedit.cpp
+++ b/src/widgets/qlineedit.cpp
@@ -38,37 +38,37 @@
 **
 **********************************************************************/
 
-#include "qlineedit.h"
+#include "ntqlineedit.h"
 #ifndef QT_NO_LINEEDIT
 
 // Keep this position to avoid patch rejection
 #ifndef QT_NO_IM
-#include "qinputcontext.h"
+#include "ntqinputcontext.h"
 #endif
 
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qfontmetrics.h"
-#include "qpixmap.h"
-#include "qclipboard.h"
-#include "qapplication.h"
-#include "qvalidator.h"
-#include "qdragobject.h"
-#include "qtimer.h"
-#include "qpopupmenu.h"
-#include "qstringlist.h"
-#include "qguardedptr.h"
-#include "qstyle.h"
-#include "qwhatsthis.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqfontmetrics.h"
+#include "ntqpixmap.h"
+#include "ntqclipboard.h"
+#include "ntqapplication.h"
+#include "ntqvalidator.h"
+#include "ntqdragobject.h"
+#include "ntqtimer.h"
+#include "ntqpopupmenu.h"
+#include "ntqstringlist.h"
+#include "ntqguardedptr.h"
+#include "ntqstyle.h"
+#include "ntqwhatsthis.h"
 #include "../kernel/qinternal_p.h"
 #include "private/qtextlayout_p.h"
-#include "qvaluevector.h"
+#include "ntqvaluevector.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 #ifndef QT_NO_ACCEL
-#include "qkeysequence.h"
+#include "ntqkeysequence.h"
 #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
 #else
 #define ACCEL_KEY(k) "\t" + TQString("Ctrl+" #k)
diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp
index c8ca44c91..2dc526655 100644
--- a/src/widgets/qlistbox.cpp
+++ b/src/widgets/qlistbox.cpp
@@ -38,28 +38,28 @@
 **
 **********************************************************************/
 
-#include "qglobal.h"
+#include "ntqglobal.h"
 #if defined(Q_CC_BOR)
 // needed for qsort() because of a std namespace problem on Borland
 #include "qplatformdefs.h"
 #endif
 
-#include "qlistbox.h"
+#include "ntqlistbox.h"
 #ifndef QT_NO_LISTBOX
-#include "qmemarray.h"
-#include "qfontmetrics.h"
-#include "qpainter.h"
-#include "qstrlist.h"
-#include "qpixmap.h"
-#include "qapplication.h"
-#include "qptrdict.h"
-#include "qtimer.h"
-#include "qstringlist.h"
-#include "qstyle.h"
-#include "qpopupmenu.h"
-#include "qguardedptr.h"
+#include "ntqmemarray.h"
+#include "ntqfontmetrics.h"
+#include "ntqpainter.h"
+#include "ntqstrlist.h"
+#include "ntqpixmap.h"
+#include "ntqapplication.h"
+#include "ntqptrdict.h"
+#include "ntqtimer.h"
+#include "ntqstringlist.h"
+#include "ntqstyle.h"
+#include "ntqpopupmenu.h"
+#include "ntqguardedptr.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 #include <stdlib.h>
@@ -161,7 +161,7 @@ TQListBoxPrivate::~TQListBoxPrivate()
 
 
 /*!
-    \class TQListBoxItem qlistbox.h
+    \class TQListBoxItem ntqlistbox.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 qlistbox.h
+    \class TQListBoxText ntqlistbox.h
     \brief The TQListBoxText class provides list box items that display text.
 
     \ingroup advanced
@@ -635,7 +635,7 @@ int TQListBoxText::rtti() const
 }
 
 /*!
-    \class TQListBoxPixmap qlistbox.h
+    \class TQListBoxPixmap ntqlistbox.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 qlistbox.h
+    \class TQListBox ntqlistbox.h
     \brief The TQListBox widget provides a list of selectable, read-only items.
 
     \ingroup advanced
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index 7340bf35b..18d87f624 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -38,34 +38,34 @@
 **
 **********************************************************************/
 
-#include "qlistview.h"
+#include "ntqlistview.h"
 #ifndef QT_NO_LISTVIEW
-#include "qtimer.h"
-#include "qheader.h"
-#include "qpainter.h"
-#include "qcursor.h"
-#include "qptrstack.h"
-#include "qptrlist.h"
-#include "qstrlist.h"
-#include "qapplication.h"
-#include "qbitmap.h"
-#include "qdatetime.h"
-#include "qptrdict.h"
-#include "qptrvector.h"
-#include "qiconset.h"
-#include "qcleanuphandler.h"
-#include "qpixmapcache.h"
-#include "qpopupmenu.h"
-#include "qtl.h"
-#include "qdragobject.h"
-#include "qlineedit.h"
-#include "qvbox.h"
-#include "qtooltip.h"
-#include "qstyle.h"
-#include "qstylesheet.h"
+#include "ntqtimer.h"
+#include "ntqheader.h"
+#include "ntqpainter.h"
+#include "ntqcursor.h"
+#include "ntqptrstack.h"
+#include "ntqptrlist.h"
+#include "ntqstrlist.h"
+#include "ntqapplication.h"
+#include "ntqbitmap.h"
+#include "ntqdatetime.h"
+#include "ntqptrdict.h"
+#include "ntqptrvector.h"
+#include "ntqiconset.h"
+#include "ntqcleanuphandler.h"
+#include "ntqpixmapcache.h"
+#include "ntqpopupmenu.h"
+#include "ntqtl.h"
+#include "ntqdragobject.h"
+#include "ntqlineedit.h"
+#include "ntqvbox.h"
+#include "ntqtooltip.h"
+#include "ntqstyle.h"
+#include "ntqstylesheet.h"
 #include "../kernel/qinternal_p.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 const int Unsorted = 16383;
diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp
index 3da52b6f7..26a96dbeb 100644
--- a/src/widgets/qmainwindow.cpp
+++ b/src/widgets/qmainwindow.cpp
@@ -38,30 +38,30 @@
 **
 **********************************************************************/
 
-#include "qmainwindow.h"
+#include "ntqmainwindow.h"
 #ifndef QT_NO_MAINWINDOW
 
-#include "qtimer.h"
-#include "qlayout.h"
-#include "qobjectlist.h"
-#include "qintdict.h"
-#include "qapplication.h"
-#include "qptrlist.h"
-#include "qmap.h"
-#include "qcursor.h"
-#include "qpainter.h"
-#include "qmenubar.h"
-#include "qpopupmenu.h"
-#include "qtoolbar.h"
-#include "qstatusbar.h"
-#include "qscrollview.h"
-#include "qtooltip.h"
-#include "qdatetime.h"
-#include "qwhatsthis.h"
-#include "qbitmap.h"
-#include "qdockarea.h"
-#include "qstringlist.h"
-#include "qstyle.h"
+#include "ntqtimer.h"
+#include "ntqlayout.h"
+#include "ntqobjectlist.h"
+#include "ntqintdict.h"
+#include "ntqapplication.h"
+#include "ntqptrlist.h"
+#include "ntqmap.h"
+#include "ntqcursor.h"
+#include "ntqpainter.h"
+#include "ntqmenubar.h"
+#include "ntqpopupmenu.h"
+#include "ntqtoolbar.h"
+#include "ntqstatusbar.h"
+#include "ntqscrollview.h"
+#include "ntqtooltip.h"
+#include "ntqdatetime.h"
+#include "ntqwhatsthis.h"
+#include "ntqbitmap.h"
+#include "ntqdockarea.h"
+#include "ntqstringlist.h"
+#include "ntqstyle.h"
 #ifdef Q_WS_MACX
 #  include "qt_mac.h"
 #endif
@@ -507,7 +507,7 @@ void TQHideToolTip::maybeTip( const TQPoint &pos )
 #endif
 
 /*!
-    \class TQMainWindow qmainwindow.h
+    \class TQMainWindow ntqmainwindow.h
     \brief The TQMainWindow class provides a main application window,
     with a menu bar, dock windows (e.g. for toolbars), and a status
     bar.
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp
index ebe231853..96a111b49 100644
--- a/src/widgets/qmenubar.cpp
+++ b/src/widgets/qmenubar.cpp
@@ -38,25 +38,25 @@
 **
 **********************************************************************/
 
-// qmainwindow.h before qmenubar.h because of GCC-2.7.* compatibility
+// ntqmainwindow.h before ntqmenubar.h because of GCC-2.7.* compatibility
 // ### could be reorganised by discarding INCLUDE_MENUITEM_DEF and put
 // the relevant declarations in a private header?
-#include "qmainwindow.h"
+#include "ntqmainwindow.h"
 #ifndef QT_NO_MENUBAR
-#include "qmenubar.h"
-#include "qpopupmenu.h"
-#include "qaccel.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qapplication.h"
-#include "qguardedptr.h"
-#include "qlayout.h"
-#include "qcleanuphandler.h"
+#include "ntqmenubar.h"
+#include "ntqpopupmenu.h"
+#include "ntqaccel.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqapplication.h"
+#include "ntqguardedptr.h"
+#include "ntqlayout.h"
+#include "ntqcleanuphandler.h"
 #include "../kernel/qinternal_p.h"
-#include "qstyle.h"
-#include "qtimer.h"
+#include "ntqstyle.h"
+#include "ntqtimer.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 class TQMenuDataData {
@@ -76,7 +76,7 @@ extern int qt_xfocusout_grab_counter; // defined in qapplication_x11.cpp
 #endif
 
 /*!
-    \class TQMenuBar qmenubar.h
+    \class TQMenuBar ntqmenubar.h
     \brief The TQMenuBar class provides a horizontal menu bar.
 
     \ingroup application
diff --git a/src/widgets/qmenudata.cpp b/src/widgets/qmenudata.cpp
index a5c2c8b09..4bacd22f8 100644
--- a/src/widgets/qmenudata.cpp
+++ b/src/widgets/qmenudata.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qmenudata.h"
+#include "ntqmenudata.h"
 #ifndef QT_NO_MENUDATA
-#include "qpopupmenu.h"
-#include "qmenubar.h"
-#include "qapplication.h"
-#include "qguardedptr.h"
+#include "ntqpopupmenu.h"
+#include "ntqmenubar.h"
+#include "ntqapplication.h"
+#include "ntqguardedptr.h"
 
 class TQMenuItemData {
 public:
@@ -62,7 +62,7 @@ TQMenuDataData::TQMenuDataData()
 {}
 
 /*!
-    \class TQMenuData qmenudata.h
+    \class TQMenuData ntqmenudata.h
     \brief The TQMenuData class is a base class for TQMenuBar and TQPopupMenu.
 
     \ingroup misc
@@ -415,7 +415,7 @@ void TQMenuData::removePopup( TQPopupMenu *popup )
     Returns the allocated menu identifier number (\a id if \a id >= 0).
 
     \sa removeItem(), changeItem(), setAccel(), connectItem(), TQAccel,
-    qnamespace.h
+    ntqnamespace.h
 */
 
 int TQMenuData::insertItem( const TQString &text,
@@ -442,7 +442,7 @@ int TQMenuData::insertItem( const TQString &text,
     Returns the allocated menu identifier number (\a id if \a id >= 0).
 
     \sa removeItem(), changeItem(), setAccel(), connectItem(), TQAccel,
-    qnamespace.h
+    ntqnamespace.h
 */
 
 int TQMenuData::insertItem( const TQIconSet& icon,
@@ -504,7 +504,7 @@ int TQMenuData::insertItem( const TQPixmap &pixmap,
     Returns the allocated menu identifier number (\a id if \a id >= 0).
 
     \sa removeItem(), changeItem(), setAccel(), connectItem(), TQAccel,
-    qnamespace.h
+    ntqnamespace.h
 */
 
 int TQMenuData::insertItem( const TQIconSet& icon,
@@ -864,7 +864,7 @@ void TQMenuData::clear()
     item \a id, or 0 if it has no accelerator key or if there is no
     such menu item.
 
-    \sa setAccel(), TQAccel, qnamespace.h
+    \sa setAccel(), TQAccel, ntqnamespace.h
 */
 
 TQKeySequence TQMenuData::accel( int id ) const
@@ -880,7 +880,7 @@ TQKeySequence TQMenuData::accel( int id ) const
 
     An accelerator key consists of a key code and a combination of the
     modifiers \c SHIFT, \c CTRL, \c ALT or \c UNICODE_ACCEL (OR'ed or
-    added). The header file \c qnamespace.h contains a list of key
+    added). The header file \c ntqnamespace.h contains a list of key
     codes.
 
     Defining an accelerator key produces a text that is added to the
@@ -1462,7 +1462,7 @@ TQString TQMenuData::whatsThis( int id ) const
 
 
 /*!
-    \class TQCustomMenuItem qmenudata.h
+    \class TQCustomMenuItem ntqmenudata.h
     \brief The TQCustomMenuItem class is an abstract base class for custom menu items in popup menus.
 
     \ingroup misc
diff --git a/src/widgets/qmultilineedit.cpp b/src/widgets/qmultilineedit.cpp
index affe2febe..e34d3f9b3 100644
--- a/src/widgets/qmultilineedit.cpp
+++ b/src/widgets/qmultilineedit.cpp
@@ -38,24 +38,24 @@
 **
 **********************************************************************/
 
-#include "qmultilineedit.h"
+#include "ntqmultilineedit.h"
 #ifndef QT_NO_MULTILINEEDIT
-#include "qpainter.h"
-#include "qscrollbar.h"
-#include "qcursor.h"
-#include "qclipboard.h"
-#include "qpixmap.h"
-#include "qregexp.h"
-#include "qapplication.h"
-#include "qdragobject.h"
-#include "qpopupmenu.h"
-#include "qtimer.h"
-#include "qdict.h"
+#include "ntqpainter.h"
+#include "ntqscrollbar.h"
+#include "ntqcursor.h"
+#include "ntqclipboard.h"
+#include "ntqpixmap.h"
+#include "ntqregexp.h"
+#include "ntqapplication.h"
+#include "ntqdragobject.h"
+#include "ntqpopupmenu.h"
+#include "ntqtimer.h"
+#include "ntqdict.h"
 #include "../kernel/qrichtext_p.h"
 
 
 /*!
-  \class TQMultiLineEdit qmultilineedit.h
+  \class TQMultiLineEdit ntqmultilineedit.h
   \obsolete
 
   \brief The TQMultiLineEdit widget is a simple editor for inputting text.
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index 77d7b9947..9c03b0319 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -38,26 +38,26 @@
 **
 **********************************************************************/
 
-#include "qpopupmenu.h"
+#include "ntqpopupmenu.h"
 #ifndef QT_NO_POPUPMENU
-#include "qmenubar.h"
-#include "qaccel.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qapplication.h"
-#include "qpixmap.h"
-#include "qpixmapcache.h"
-#include "qtimer.h"
-#include "qwhatsthis.h"
-#include "qobjectlist.h"
-#include "qguardedptr.h"
+#include "ntqmenubar.h"
+#include "ntqaccel.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqapplication.h"
+#include "ntqpixmap.h"
+#include "ntqpixmapcache.h"
+#include "ntqtimer.h"
+#include "ntqwhatsthis.h"
+#include "ntqobjectlist.h"
+#include "ntqguardedptr.h"
 #include "qeffects_p.h"
-#include "qcursor.h"
-#include "qstyle.h"
-#include "qtimer.h"
-#include "qdatetime.h"
+#include "ntqcursor.h"
+#include "ntqstyle.h"
+#include "ntqtimer.h"
+#include "ntqdatetime.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 //#define ANIMATED_POPUP
@@ -129,7 +129,7 @@ static TQMenuItem* whatsThisItem = 0;
 #endif
 
 /*!
-    \class TQPopupMenu qpopupmenu.h
+    \class TQPopupMenu ntqpopupmenu.h
     \brief The TQPopupMenu class provides a popup menu widget.
 
     \ingroup application
diff --git a/src/widgets/qprogressbar.cpp b/src/widgets/qprogressbar.cpp
index 345038e8b..09d6befd7 100644
--- a/src/widgets/qprogressbar.cpp
+++ b/src/widgets/qprogressbar.cpp
@@ -38,20 +38,20 @@
 **
 **********************************************************************/
 
-#include "qprogressbar.h"
+#include "ntqprogressbar.h"
 #ifndef QT_NO_PROGRESSBAR
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqstyle.h"
 #include "../kernel/qinternal_p.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 #include <limits.h>
 
 /*!
-    \class TQProgressBar qprogressbar.h
+    \class TQProgressBar ntqprogressbar.h
     \brief The TQProgressBar widget provides a horizontal progress bar.
 
     \ingroup advanced
diff --git a/src/widgets/qpushbutton.cpp b/src/widgets/qpushbutton.cpp
index 31641161e..cbb45e443 100644
--- a/src/widgets/qpushbutton.cpp
+++ b/src/widgets/qpushbutton.cpp
@@ -38,25 +38,25 @@
 **
 **********************************************************************/
 
-#include "qpushbutton.h"
+#include "ntqpushbutton.h"
 #ifndef QT_NO_PUSHBUTTON
-#include "qdialog.h"
-#include "qfontmetrics.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qbitmap.h"
-#include "qpopupmenu.h"
-#include "qguardedptr.h"
-#include "qapplication.h"
-#include "qtoolbar.h"
-#include "qstyle.h"
+#include "ntqdialog.h"
+#include "ntqfontmetrics.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqbitmap.h"
+#include "ntqpopupmenu.h"
+#include "ntqguardedptr.h"
+#include "ntqapplication.h"
+#include "ntqtoolbar.h"
+#include "ntqstyle.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 /*!
-    \class TQPushButton qpushbutton.h
+    \class TQPushButton ntqpushbutton.h
     \brief The TQPushButton widget provides a command button.
 
     \ingroup basic
diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/qradiobutton.cpp
index 39f0e9740..e4c343f90 100644
--- a/src/widgets/qradiobutton.cpp
+++ b/src/widgets/qradiobutton.cpp
@@ -38,20 +38,20 @@
 **
 **********************************************************************/
 
-#include "qradiobutton.h"
+#include "ntqradiobutton.h"
 #ifndef QT_NO_RADIOBUTTON
-#include "qbuttongroup.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qpixmap.h"
-#include "qpixmapcache.h"
-#include "qbitmap.h"
-#include "qtextstream.h"
-#include "qapplication.h"
-#include "qstyle.h"
+#include "ntqbuttongroup.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqpixmap.h"
+#include "ntqpixmapcache.h"
+#include "ntqbitmap.h"
+#include "ntqtextstream.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
 
 /*!
-    \class TQRadioButton qradiobutton.h
+    \class TQRadioButton ntqradiobutton.h
     \brief The TQRadioButton widget provides a radio button with a text or pixmap label.
 
     \ingroup basic
diff --git a/src/widgets/qrangecontrol.cpp b/src/widgets/qrangecontrol.cpp
index a561b3d77..036f8c7b6 100644
--- a/src/widgets/qrangecontrol.cpp
+++ b/src/widgets/qrangecontrol.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qrangecontrol.h"
+#include "ntqrangecontrol.h"
 #ifndef QT_NO_RANGECONTROL
-#include "qglobal.h"
+#include "ntqglobal.h"
 #include <limits.h>
 
 static bool sumOutOfRange(int current, int add);
 
 
 /*!
-    \class TQRangeControl qrangecontrol.h
+    \class TQRangeControl ntqrangecontrol.h
     \brief The TQRangeControl class provides an integer value within a range.
 
     \ingroup misc
diff --git a/src/widgets/qscrollbar.cpp b/src/widgets/qscrollbar.cpp
index e73dc2ed5..cd5b73f29 100644
--- a/src/widgets/qscrollbar.cpp
+++ b/src/widgets/qscrollbar.cpp
@@ -38,18 +38,18 @@
 **
 **********************************************************************/
 
-#include "qscrollbar.h"
+#include "ntqscrollbar.h"
 #ifndef QT_NO_SCROLLBAR
-#include "qpainter.h"
-#include "qbitmap.h"
-#include "qapplication.h"
-#include "qtimer.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqbitmap.h"
+#include "ntqapplication.h"
+#include "ntqtimer.h"
+#include "ntqstyle.h"
 #ifndef QT_NO_CURSOR
-#include <qcursor.h>
+#include <ntqcursor.h>
 #endif
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 #include <limits.h>
 
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index 03cf1ae17..484e67da4 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -38,20 +38,20 @@
 **
 **********************************************************************/
 
-#include "qwidget.h"
+#include "ntqwidget.h"
 #ifndef QT_NO_SCROLLVIEW
-#include "qscrollbar.h"
-#include "qobjectlist.h"
-#include "qpainter.h"
-#include "qpixmap.h"
-#include "qcursor.h"
-#include "qfocusdata.h"
-#include "qscrollview.h"
-#include "qptrdict.h"
-#include "qapplication.h"
-#include "qtimer.h"
-#include "qstyle.h"
-#include "qlistview.h"
+#include "ntqscrollbar.h"
+#include "ntqobjectlist.h"
+#include "ntqpainter.h"
+#include "ntqpixmap.h"
+#include "ntqcursor.h"
+#include "ntqfocusdata.h"
+#include "ntqscrollview.h"
+#include "ntqptrdict.h"
+#include "ntqapplication.h"
+#include "ntqtimer.h"
+#include "ntqstyle.h"
+#include "ntqlistview.h"
 #ifdef Q_WS_MAC
 # include "qt_mac.h"
 #endif
@@ -348,7 +348,7 @@ void TQScrollViewData::viewportResized( int w, int h )
 
 
 /*!
-    \class TQScrollView qscrollview.h
+    \class TQScrollView ntqscrollview.h
     \brief The TQScrollView widget provides a scrolling area with on-demand scroll bars.
 
     \ingroup abstractwidgets
diff --git a/src/widgets/qslider.cpp b/src/widgets/qslider.cpp
index 6c1349b71..e6b555a18 100644
--- a/src/widgets/qslider.cpp
+++ b/src/widgets/qslider.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qslider.h"
+#include "ntqslider.h"
 #ifndef QT_NO_SLIDER
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qtimer.h"
-#include "qbitmap.h"
-#include "qapplication.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqtimer.h"
+#include "ntqbitmap.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 static const int thresholdTime = 300;
diff --git a/src/widgets/qspinbox.cpp b/src/widgets/qspinbox.cpp
index f92b3ac49..c4419cee2 100644
--- a/src/widgets/qspinbox.cpp
+++ b/src/widgets/qspinbox.cpp
@@ -38,20 +38,20 @@
 **
 **********************************************************************/
 
-#include "qspinbox.h"
+#include "ntqspinbox.h"
 #ifndef QT_NO_SPINBOX
 
-#include "qcursor.h"
-#include "qpushbutton.h"
-#include "qpainter.h"
-#include "qbitmap.h"
-#include "qlineedit.h"
-#include "qvalidator.h"
-#include "qpixmapcache.h"
-#include "qapplication.h"
-#include "qstyle.h"
+#include "ntqcursor.h"
+#include "ntqpushbutton.h"
+#include "ntqpainter.h"
+#include "ntqbitmap.h"
+#include "ntqlineedit.h"
+#include "ntqvalidator.h"
+#include "ntqpixmapcache.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 static bool sumOutOfRange(int current, int add)
diff --git a/src/widgets/qspinwidget.cpp b/src/widgets/qspinwidget.cpp
index 080f2ee34..f0b6b7809 100644
--- a/src/widgets/qspinwidget.cpp
+++ b/src/widgets/qspinwidget.cpp
@@ -36,14 +36,14 @@
 **
 **********************************************************************/
 
-#include "qrangecontrol.h"
+#include "ntqrangecontrol.h"
 
 #ifndef QT_NO_SPINWIDGET
 
-#include "qrect.h"
-#include "qtimer.h"
-#include "qstyle.h"
-#include "qpainter.h"
+#include "ntqrect.h"
+#include "ntqtimer.h"
+#include "ntqstyle.h"
+#include "ntqpainter.h"
 
 class TQSpinWidgetPrivate
 {
diff --git a/src/widgets/qsplashscreen.cpp b/src/widgets/qsplashscreen.cpp
index fe18ebe27..6be1506be 100644
--- a/src/widgets/qsplashscreen.cpp
+++ b/src/widgets/qsplashscreen.cpp
@@ -36,13 +36,13 @@
 **
 **********************************************************************/
 
-#include "qsplashscreen.h"
+#include "ntqsplashscreen.h"
 
 #ifndef QT_NO_SPLASHSCREEN
 
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qpixmap.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqpixmap.h"
 
 class TQSplashScreenPrivate
 {
@@ -54,7 +54,7 @@ public:
 };
 
 /*!
-   \class TQSplashScreen qsplashscreen.h
+   \class TQSplashScreen ntqsplashscreen.h
    \brief The TQSplashScreen widget provides a splash screen that can
    be shown during application startup.
 
diff --git a/src/widgets/qsplitter.cpp b/src/widgets/qsplitter.cpp
index 7dd3f75e9..95ec5d5ae 100644
--- a/src/widgets/qsplitter.cpp
+++ b/src/widgets/qsplitter.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qsplitter.h"
+#include "ntqsplitter.h"
 #ifndef QT_NO_SPLITTER
 
-#include "qlayout.h"
+#include "ntqlayout.h"
 #include "../kernel/qlayoutengine_p.h"
-#include "qapplication.h"
-#include "qbitmap.h"
-#include "qdrawutil.h"
-#include "qmemarray.h"
-#include "qobjectlist.h"
-#include "qpainter.h"
-#include "qptrlist.h"
-#include "qstyle.h"
+#include "ntqapplication.h"
+#include "ntqbitmap.h"
+#include "ntqdrawutil.h"
+#include "ntqmemarray.h"
+#include "ntqobjectlist.h"
+#include "ntqpainter.h"
+#include "ntqptrlist.h"
+#include "ntqstyle.h"
 
 const uint Default = QT_QSPLITTER_DEFAULT;
 
diff --git a/src/widgets/qstatusbar.cpp b/src/widgets/qstatusbar.cpp
index c2c8a1570..ea4172e29 100644
--- a/src/widgets/qstatusbar.cpp
+++ b/src/widgets/qstatusbar.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qstatusbar.h"
+#include "ntqstatusbar.h"
 #ifndef QT_NO_STATUSBAR
 
-#include "qptrlist.h"
-#include "qlayout.h"
-#include "qpainter.h"
-#include "qtimer.h"
-#include "qdrawutil.h"
-#include "qstyle.h"
-#include "qsizegrip.h"
+#include "ntqptrlist.h"
+#include "ntqlayout.h"
+#include "ntqpainter.h"
+#include "ntqtimer.h"
+#include "ntqdrawutil.h"
+#include "ntqstyle.h"
+#include "ntqsizegrip.h"
 
 /*!
-    \class TQStatusBar qstatusbar.h
+    \class TQStatusBar ntqstatusbar.h
     \brief The TQStatusBar class provides a horizontal bar suitable for
     presenting status information.
 
diff --git a/src/widgets/qsyntaxhighlighter.cpp b/src/widgets/qsyntaxhighlighter.cpp
index bf8938bbc..6c97ac517 100644
--- a/src/widgets/qsyntaxhighlighter.cpp
+++ b/src/widgets/qsyntaxhighlighter.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qsyntaxhighlighter.h"
+#include "ntqsyntaxhighlighter.h"
 #include "private/qsyntaxhighlighter_p.h"
 
 #ifndef QT_NO_SYNTAXHIGHLIGHTER
 #include "../kernel/qrichtext_p.h"
-#include "qtextedit.h"
-#include "qtimer.h"
+#include "ntqtextedit.h"
+#include "ntqtimer.h"
 
 /*!
-    \class TQSyntaxHighlighter qsyntaxhighlighter.h
+    \class TQSyntaxHighlighter ntqsyntaxhighlighter.h
     \brief The TQSyntaxHighlighter class is a base class for
     implementing TQTextEdit syntax highlighters.
 
diff --git a/src/widgets/qsyntaxhighlighter_p.h b/src/widgets/qsyntaxhighlighter_p.h
index 28f7fa844..594a73e57 100644
--- a/src/widgets/qsyntaxhighlighter_p.h
+++ b/src/widgets/qsyntaxhighlighter_p.h
@@ -42,7 +42,7 @@
 #define TQSYNTAXHIGHLIGHTER_P_H
 
 #ifndef QT_NO_SYNTAXHIGHLIGHTER
-#include "qsyntaxhighlighter.h"
+#include "ntqsyntaxhighlighter.h"
 #include "private/qrichtext_p.h"
 
 class TQSyntaxHighlighterPrivate
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index a4917e9bf..9410e3e4a 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -3,66 +3,66 @@
 widgets {
 	WIDGETS_P	= widgets
 
-	HEADERS += $$WIDGETS_H/qbuttongroup.h \
-		  $$WIDGETS_H/qbutton.h \
+	HEADERS += $$WIDGETS_H/ntqbuttongroup.h \
+		  $$WIDGETS_H/ntqbutton.h \
 		  $$WIDGETS_P/qdialogbuttons_p.h \
-		  $$WIDGETS_H/qcheckbox.h \
-		  $$WIDGETS_H/qcombobox.h \
+		  $$WIDGETS_H/ntqcheckbox.h \
+		  $$WIDGETS_H/ntqcombobox.h \
 		  $$WIDGETS_P/qwidgetresizehandler_p.h \
-		  $$WIDGETS_H/qdial.h \
-		  $$WIDGETS_H/qdockarea.h \
-		  $$WIDGETS_H/qdockwindow.h \
-		  $$WIDGETS_H/qframe.h \
-		  $$WIDGETS_H/qgrid.h \
-		  $$WIDGETS_H/qgridview.h \
-		  $$WIDGETS_H/qgroupbox.h \
-		  $$WIDGETS_H/qhbuttongroup.h \
-		  $$WIDGETS_H/qheader.h \
-		  $$WIDGETS_H/qhgroupbox.h \
-		  $$WIDGETS_H/qhbox.h \
-		  $$WIDGETS_H/qlabel.h \
-		  $$WIDGETS_H/qlcdnumber.h \
-		  $$WIDGETS_H/qlineedit.h \
-		  $$WIDGETS_H/qlistbox.h \
-		  $$WIDGETS_H/qlistview.h \
-		  $$WIDGETS_H/qmainwindow.h \
-		  $$WIDGETS_H/qmenubar.h \
-		  $$WIDGETS_H/qmenudata.h \
-		  $$WIDGETS_H/qmultilineedit.h \
-		  $$WIDGETS_H/qpopupmenu.h \
-		  $$WIDGETS_H/qprogressbar.h \
-		  $$WIDGETS_H/qpushbutton.h \
-		  $$WIDGETS_H/qradiobutton.h \
-		  $$WIDGETS_H/qrangecontrol.h \
-		  $$WIDGETS_H/qscrollbar.h \
-		  $$WIDGETS_H/qscrollview.h \
-		  $$WIDGETS_H/qslider.h \
-		  $$WIDGETS_H/qsplashscreen.h \
-		  $$WIDGETS_H/qspinbox.h \
-		  $$WIDGETS_H/qsplitter.h \
-		  $$WIDGETS_H/qstatusbar.h \
-		  $$WIDGETS_H/qtabbar.h \
-		  $$WIDGETS_H/qsyntaxhighlighter.h \
+		  $$WIDGETS_H/ntqdial.h \
+		  $$WIDGETS_H/ntqdockarea.h \
+		  $$WIDGETS_H/ntqdockwindow.h \
+		  $$WIDGETS_H/ntqframe.h \
+		  $$WIDGETS_H/ntqgrid.h \
+		  $$WIDGETS_H/ntqgridview.h \
+		  $$WIDGETS_H/ntqgroupbox.h \
+		  $$WIDGETS_H/ntqhbuttongroup.h \
+		  $$WIDGETS_H/ntqheader.h \
+		  $$WIDGETS_H/ntqhgroupbox.h \
+		  $$WIDGETS_H/ntqhbox.h \
+		  $$WIDGETS_H/ntqlabel.h \
+		  $$WIDGETS_H/ntqlcdnumber.h \
+		  $$WIDGETS_H/ntqlineedit.h \
+		  $$WIDGETS_H/ntqlistbox.h \
+		  $$WIDGETS_H/ntqlistview.h \
+		  $$WIDGETS_H/ntqmainwindow.h \
+		  $$WIDGETS_H/ntqmenubar.h \
+		  $$WIDGETS_H/ntqmenudata.h \
+		  $$WIDGETS_H/ntqmultilineedit.h \
+		  $$WIDGETS_H/ntqpopupmenu.h \
+		  $$WIDGETS_H/ntqprogressbar.h \
+		  $$WIDGETS_H/ntqpushbutton.h \
+		  $$WIDGETS_H/ntqradiobutton.h \
+		  $$WIDGETS_H/ntqrangecontrol.h \
+		  $$WIDGETS_H/ntqscrollbar.h \
+		  $$WIDGETS_H/ntqscrollview.h \
+		  $$WIDGETS_H/ntqslider.h \
+		  $$WIDGETS_H/ntqsplashscreen.h \
+		  $$WIDGETS_H/ntqspinbox.h \
+		  $$WIDGETS_H/ntqsplitter.h \
+		  $$WIDGETS_H/ntqstatusbar.h \
+		  $$WIDGETS_H/ntqtabbar.h \
+		  $$WIDGETS_H/ntqsyntaxhighlighter.h \
 		  $$WIDGETS_P/qsyntaxhighlighter_p.h \
-		  $$WIDGETS_H/qtabwidget.h \
+		  $$WIDGETS_H/ntqtabwidget.h \
 		  $$WIDGETS_P/qtitlebar_p.h \
-		  $$WIDGETS_H/qtoolbar.h \
-		  $$WIDGETS_H/qtoolbox.h \
-		  $$WIDGETS_H/qtoolbutton.h \
-		  $$WIDGETS_H/qtooltip.h \
-		  $$WIDGETS_H/qvalidator.h \
-		  $$WIDGETS_H/qvbox.h \
-		  $$WIDGETS_H/qvbuttongroup.h \
-		  $$WIDGETS_H/qvgroupbox.h \
-		  $$WIDGETS_H/qwhatsthis.h \
-		  $$WIDGETS_H/qwidgetstack.h \
-		  $$WIDGETS_H/qaction.h \
-		  $$WIDGETS_H/qdatetimeedit.h \
-		  $$WIDGETS_H/qtextview.h \
-		  $$WIDGETS_H/qtextbrowser.h \
-		  $$WIDGETS_H/qtextedit.h \
+		  $$WIDGETS_H/ntqtoolbar.h \
+		  $$WIDGETS_H/ntqtoolbox.h \
+		  $$WIDGETS_H/ntqtoolbutton.h \
+		  $$WIDGETS_H/ntqtooltip.h \
+		  $$WIDGETS_H/ntqvalidator.h \
+		  $$WIDGETS_H/ntqvbox.h \
+		  $$WIDGETS_H/ntqvbuttongroup.h \
+		  $$WIDGETS_H/ntqvgroupbox.h \
+		  $$WIDGETS_H/ntqwhatsthis.h \
+		  $$WIDGETS_H/ntqwidgetstack.h \
+		  $$WIDGETS_H/ntqaction.h \
+		  $$WIDGETS_H/ntqdatetimeedit.h \
+		  $$WIDGETS_H/ntqtextview.h \
+		  $$WIDGETS_H/ntqtextbrowser.h \
+		  $$WIDGETS_H/ntqtextedit.h \
 		  $$WIDGETS_P/qwidgetinterface_p.h \
-		  $$WIDGETS_H/qwidgetplugin.h
+		  $$WIDGETS_H/ntqwidgetplugin.h
 
 	SOURCES += $$WIDGETS_CPP/qbuttongroup.cpp \
 		  $$WIDGETS_CPP/qbutton.cpp \
@@ -134,6 +134,6 @@ wince-* {
 	SOURCES -= $$WIDGETS_CPP/qsyntaxhighlighter.cpp \
 		   $$WIDGETS_CPP/qsplashscreen.cpp
 
-	HEADERS -= $$WIDGETS_H/qsyntaxhighlighter.h \
-		   $$WIDGETS_H/qsplashscreen.h
+	HEADERS -= $$WIDGETS_H/ntqsyntaxhighlighter.h \
+		   $$WIDGETS_H/ntqsplashscreen.h
 }
diff --git a/src/widgets/qtabbar.cpp b/src/widgets/qtabbar.cpp
index e86ff041c..b141de8d4 100644
--- a/src/widgets/qtabbar.cpp
+++ b/src/widgets/qtabbar.cpp
@@ -36,20 +36,20 @@
 **
 **********************************************************************/
 
-#include "qtabbar.h"
+#include "ntqtabbar.h"
 #ifndef QT_NO_TABBAR
-#include "qaccel.h"
-#include "qbitmap.h"
-#include "qtoolbutton.h"
-#include "qtooltip.h"
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qpainter.h"
-#include "qiconset.h"
-#include "qcursor.h"
+#include "ntqaccel.h"
+#include "ntqbitmap.h"
+#include "ntqtoolbutton.h"
+#include "ntqtooltip.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqpainter.h"
+#include "ntqiconset.h"
+#include "ntqcursor.h"
 #include "../kernel/qinternal_p.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 
 #ifdef Q_WS_MACX
@@ -58,7 +58,7 @@
 
 
 /*!
-    \class TQTab qtabbar.h
+    \class TQTab ntqtabbar.h
     \brief The TQTab class provides the structures in a TQTabBar.
 
     \ingroup advanced
@@ -169,7 +169,7 @@ TQTab::~TQTab()
 }
 
 /*!
-    \class TQTabBar qtabbar.h
+    \class TQTabBar ntqtabbar.h
     \brief The TQTabBar class provides a tab bar, e.g. for use in tabbed dialogs.
 
     \ingroup advanced
diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp
index 0621f0e38..9da69d02e 100644
--- a/src/widgets/qtabwidget.cpp
+++ b/src/widgets/qtabwidget.cpp
@@ -38,24 +38,24 @@
 **
 **********************************************************************/
 
-#include "qtabwidget.h"
+#include "ntqtabwidget.h"
 #ifndef QT_NO_TABWIDGET
-#include "qobjectlist.h"
-#include "qtabbar.h"
-#include "qapplication.h"
-#include "qwidgetstack.h"
-#include "qbitmap.h"
-#include "qaccel.h"
-#include "qstyle.h"
-#include "qpainter.h"
-#include "qtoolbutton.h"
+#include "ntqobjectlist.h"
+#include "ntqtabbar.h"
+#include "ntqapplication.h"
+#include "ntqwidgetstack.h"
+#include "ntqbitmap.h"
+#include "ntqaccel.h"
+#include "ntqstyle.h"
+#include "ntqpainter.h"
+#include "ntqtoolbutton.h"
 
 #ifdef Q_OS_MACX
 #include <qmacstyle_mac.h>
 #endif
 
 /*!
-    \class TQTabWidget qtabwidget.h
+    \class TQTabWidget ntqtabwidget.h
     \brief The TQTabWidget class provides a stack of tabbed widgets.
 
     \ingroup organizers
diff --git a/src/widgets/qtextbrowser.cpp b/src/widgets/qtextbrowser.cpp
index 984f66751..d8d9b8a27 100644
--- a/src/widgets/qtextbrowser.cpp
+++ b/src/widgets/qtextbrowser.cpp
@@ -38,29 +38,29 @@
 **
 **********************************************************************/
 
-#include "qtextbrowser.h"
+#include "ntqtextbrowser.h"
 #ifndef QT_NO_TEXTBROWSER
 #include "../kernel/qrichtext_p.h"
 
-#include "qapplication.h"
-#include "qlayout.h"
-#include "qpainter.h"
+#include "ntqapplication.h"
+#include "ntqlayout.h"
+#include "ntqpainter.h"
 
-#include "qvaluestack.h"
+#include "ntqvaluestack.h"
 #include "stdio.h"
-#include "qfile.h"
-#include "qtextstream.h"
-#include "qlayout.h"
-#include "qbitmap.h"
-#include "qtimer.h"
-#include "qimage.h"
-#include "qsimplerichtext.h"
-#include "qdragobject.h"
-#include "qurl.h"
-#include "qcursor.h"
+#include "ntqfile.h"
+#include "ntqtextstream.h"
+#include "ntqlayout.h"
+#include "ntqbitmap.h"
+#include "ntqtimer.h"
+#include "ntqimage.h"
+#include "ntqsimplerichtext.h"
+#include "ntqdragobject.h"
+#include "ntqurl.h"
+#include "ntqcursor.h"
 
 /*!
-    \class TQTextBrowser qtextbrowser.h
+    \class TQTextBrowser ntqtextbrowser.h
     \brief The TQTextBrowser class provides a rich text browser with hypertext navigation.
 
     \ingroup advanced
diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp
index e2a78743d..561903ab1 100644
--- a/src/widgets/qtextedit.cpp
+++ b/src/widgets/qtextedit.cpp
@@ -38,48 +38,48 @@
 **
 **********************************************************************/
 
-#include "qtextedit.h"
+#include "ntqtextedit.h"
 
 #ifndef QT_NO_TEXTEDIT
 
 // Keep this position to avoid patch rejection
 #ifndef QT_NO_IM
-#include "qinputcontext.h"
+#include "ntqinputcontext.h"
 #endif
 
 #include "../kernel/qrichtext_p.h"
-#include "qpainter.h"
-#include "qpen.h"
-#include "qbrush.h"
-#include "qpixmap.h"
-#include "qfont.h"
-#include "qcolor.h"
-#include "qstyle.h"
-#include "qsize.h"
-#include "qevent.h"
-#include "qtimer.h"
-#include "qapplication.h"
-#include "qlistbox.h"
-#include "qvbox.h"
-#include "qapplication.h"
-#include "qclipboard.h"
-#include "qcolordialog.h"
-#include "qfontdialog.h"
-#include "qstylesheet.h"
-#include "qdragobject.h"
-#include "qurl.h"
-#include "qcursor.h"
-#include "qregexp.h"
-#include "qpopupmenu.h"
-#include "qptrstack.h"
-#include "qmetaobject.h"
-#include "qtextbrowser.h"
+#include "ntqpainter.h"
+#include "ntqpen.h"
+#include "ntqbrush.h"
+#include "ntqpixmap.h"
+#include "ntqfont.h"
+#include "ntqcolor.h"
+#include "ntqstyle.h"
+#include "ntqsize.h"
+#include "ntqevent.h"
+#include "ntqtimer.h"
+#include "ntqapplication.h"
+#include "ntqlistbox.h"
+#include "ntqvbox.h"
+#include "ntqapplication.h"
+#include "ntqclipboard.h"
+#include "ntqcolordialog.h"
+#include "ntqfontdialog.h"
+#include "ntqstylesheet.h"
+#include "ntqdragobject.h"
+#include "ntqurl.h"
+#include "ntqcursor.h"
+#include "ntqregexp.h"
+#include "ntqpopupmenu.h"
+#include "ntqptrstack.h"
+#include "ntqmetaobject.h"
+#include "ntqtextbrowser.h"
 #include <private/qucom_p.h>
 #include "private/qsyntaxhighlighter_p.h"
-#include <qguardedptr.h>
+#include <ntqguardedptr.h>
 
 #ifndef QT_NO_ACCEL
-#include <qkeysequence.h>
+#include <ntqkeysequence.h>
 #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
 #else
 #define ACCEL_KEY(k) "\t" + TQString("Ctrl+" #k)
@@ -213,7 +213,7 @@ const char* TQRichTextDrag::format( int i ) const
 static bool block_set_alignment = FALSE;
 
 /*!
-    \class TQTextEdit qtextedit.h
+    \class TQTextEdit ntqtextedit.h
     \brief The TQTextEdit widget provides a powerful single-page rich text editor.
 
     \ingroup basic
diff --git a/src/widgets/qtextview.cpp b/src/widgets/qtextview.cpp
index 3aa444524..475236dc8 100644
--- a/src/widgets/qtextview.cpp
+++ b/src/widgets/qtextview.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qtextview.h"
+#include "ntqtextview.h"
 
 #ifndef QT_NO_TEXTVIEW
 
diff --git a/src/widgets/qtitlebar.cpp b/src/widgets/qtitlebar.cpp
index fc607b080..1bf94d6d6 100644
--- a/src/widgets/qtitlebar.cpp
+++ b/src/widgets/qtitlebar.cpp
@@ -44,19 +44,19 @@
 
 #ifndef QT_NO_TITLEBAR
 
-#include <qcursor.h>
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qdatetime.h"
+#include <ntqcursor.h>
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqdatetime.h"
 #include "private/qapplication_p.h"
-#include "qtooltip.h"
-#include "qimage.h"
-#include "qtimer.h"
-#include "qpainter.h"
-#include "qstyle.h"
+#include "ntqtooltip.h"
+#include "ntqimage.h"
+#include "ntqtimer.h"
+#include "ntqpainter.h"
+#include "ntqstyle.h"
 #include "private/qinternal_p.h"
 #ifndef QT_NO_WORKSPACE
-#include "qworkspace.h"
+#include "ntqworkspace.h"
 #endif
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h
index 27a9871e1..e50315804 100644
--- a/src/widgets/qtitlebar_p.h
+++ b/src/widgets/qtitlebar_p.h
@@ -56,8 +56,8 @@
 
 
 #ifndef QT_H
-#include "qbutton.h"
-#include "qlabel.h"
+#include "ntqbutton.h"
+#include "ntqlabel.h"
 #endif // QT_H
 
 #if !defined(QT_NO_TITLEBAR)
diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp
index 103c3b429..024ad323d 100644
--- a/src/widgets/qtoolbar.cpp
+++ b/src/widgets/qtoolbar.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "qtoolbar.h"
+#include "ntqtoolbar.h"
 #ifndef QT_NO_TOOLBAR
 
-#include "qmainwindow.h"
-#include "qtooltip.h"
-#include "qcursor.h"
-#include "qlayout.h"
-#include "qframe.h"
-#include "qobjectlist.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qtoolbutton.h"
-#include "qpopupmenu.h"
-#include "qcombobox.h"
-#include "qtimer.h"
-#include "qwidgetlist.h"
-#include "qstyle.h"
+#include "ntqmainwindow.h"
+#include "ntqtooltip.h"
+#include "ntqcursor.h"
+#include "ntqlayout.h"
+#include "ntqframe.h"
+#include "ntqobjectlist.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqtoolbutton.h"
+#include "ntqpopupmenu.h"
+#include "ntqcombobox.h"
+#include "ntqtimer.h"
+#include "ntqwidgetlist.h"
+#include "ntqstyle.h"
 
 static const char * const arrow_v_xpm[] = {
     "7 9 3 1",
@@ -211,7 +211,7 @@ void TQToolBarSeparator::paintEvent( TQPaintEvent * )
 
 
 /*!
-    \class TQToolBar qtoolbar.h
+    \class TQToolBar ntqtoolbar.h
     \brief The TQToolBar class provides a movable panel containing
     widgets such as tool buttons.
 
@@ -258,7 +258,7 @@ void TQToolBarSeparator::paintEvent( TQPaintEvent * )
     in the example above) as a child of a TQMainWindow the toolbar will
     be added to the top dock area. You can move it to another dock
     area (or float it) by calling TQMainWindow::moveDockWindow(). TQDock
-    areas lay out their windows in \link qdockarea.html#lines
+    areas lay out their windows in \link ntqdockarea.html#lines
     Lines\endlink.
 
     If the main window is resized so that the area occupied by the
diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp
index dd7d59e8c..05793a7de 100644
--- a/src/widgets/qtoolbox.cpp
+++ b/src/widgets/qtoolbox.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "qtoolbox.h"
+#include "ntqtoolbox.h"
 
 #ifndef QT_NO_TOOLBOX
 
-#include <qbutton.h>
-#include <qlayout.h>
-#include <qscrollview.h>
-#include <qpainter.h>
-#include <qstyle.h>
-#include <qobjectlist.h>
-#include <qapplication.h>
-#include <qwidgetlist.h>
-#include <qlayout.h>
-#include <qvaluelist.h>
-#include <qtooltip.h>
-#include <qeventloop.h>
-#include <qdatetime.h>
+#include <ntqbutton.h>
+#include <ntqlayout.h>
+#include <ntqscrollview.h>
+#include <ntqpainter.h>
+#include <ntqstyle.h>
+#include <ntqobjectlist.h>
+#include <ntqapplication.h>
+#include <ntqwidgetlist.h>
+#include <ntqlayout.h>
+#include <ntqvaluelist.h>
+#include <ntqtooltip.h>
+#include <ntqeventloop.h>
+#include <ntqdatetime.h>
 
 class TQToolBoxButton : public TQButton
 {
diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp
index 7243e8e8f..eac653d99 100644
--- a/src/widgets/qtoolbutton.cpp
+++ b/src/widgets/qtoolbutton.cpp
@@ -39,23 +39,23 @@
 **********************************************************************/
 
 #undef QT_NO_COMPAT
-#include "qtoolbutton.h"
+#include "ntqtoolbutton.h"
 #ifndef QT_NO_TOOLBUTTON
 
-#include "qdrawutil.h"
-#include "qpainter.h"
-#include "qpixmap.h"
-#include "qwmatrix.h"
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qmainwindow.h"
-#include "qtooltip.h"
-#include "qtoolbar.h"
-#include "qimage.h"
-#include "qiconset.h"
-#include "qtimer.h"
-#include "qpopupmenu.h"
-#include "qguardedptr.h"
+#include "ntqdrawutil.h"
+#include "ntqpainter.h"
+#include "ntqpixmap.h"
+#include "ntqwmatrix.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqmainwindow.h"
+#include "ntqtooltip.h"
+#include "ntqtoolbar.h"
+#include "ntqimage.h"
+#include "ntqiconset.h"
+#include "ntqtimer.h"
+#include "ntqpopupmenu.h"
+#include "ntqguardedptr.h"
 
 class TQToolButtonPrivate
 {
@@ -76,7 +76,7 @@ public:
 
 
 /*!
-    \class TQToolButton qtoolbutton.h
+    \class TQToolButton ntqtoolbutton.h
     \brief The TQToolButton class provides a tquick-access button to
     commands or options, usually used inside a TQToolBar.
 
diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp
index e61707f58..ace4fd317 100644
--- a/src/widgets/qtooltip.cpp
+++ b/src/widgets/qtooltip.cpp
@@ -36,13 +36,13 @@
 **
 **********************************************************************/
 
-#include "qtooltip.h"
+#include "ntqtooltip.h"
 #ifndef QT_NO_TOOLTIP
-#include "qlabel.h"
-#include "qptrdict.h"
-#include "qapplication.h"
-#include "qguardedptr.h"
-#include "qtimer.h"
+#include "ntqlabel.h"
+#include "ntqptrdict.h"
+#include "ntqapplication.h"
+#include "ntqguardedptr.h"
+#include "ntqtimer.h"
 #include "qeffects_p.h"
 
 static bool globally_enabled = TRUE;
@@ -649,7 +649,7 @@ void TQTipManager::setWakeUpDelay ( int i )
 }
 
 /*!
-    \class TQToolTip qtooltip.h
+    \class TQToolTip ntqtooltip.h
     \brief The TQToolTip class provides tool tips (balloon help) for
     any widget or rectangular part of a widget.
 
@@ -1102,7 +1102,7 @@ void TQToolTip::clear()
 
 
 /*!
-    \class TQToolTipGroup qtooltip.h
+    \class TQToolTipGroup ntqtooltip.h
     \brief The TQToolTipGroup class collects tool tips into related groups.
 
     \ingroup helpsystem
diff --git a/src/widgets/qvalidator.cpp b/src/widgets/qvalidator.cpp
index b5df08e9a..20c86bfc3 100644
--- a/src/widgets/qvalidator.cpp
+++ b/src/widgets/qvalidator.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qvalidator.h"
+#include "ntqvalidator.h"
 #ifndef QT_NO_VALIDATOR
 
 #include <limits.h>
diff --git a/src/widgets/qvbox.cpp b/src/widgets/qvbox.cpp
index a80e952db..975c2416a 100644
--- a/src/widgets/qvbox.cpp
+++ b/src/widgets/qvbox.cpp
@@ -39,11 +39,11 @@
 **********************************************************************/
 
 
-#include "qvbox.h"
+#include "ntqvbox.h"
 #ifndef QT_NO_VBOX
 
 /*!
-    \class TQVBox qvbox.h
+    \class TQVBox ntqvbox.h
     \brief The TQVBox widget provides vertical geometry management of
     its child widgets.
 
diff --git a/src/widgets/qvbuttongroup.cpp b/src/widgets/qvbuttongroup.cpp
index 79dc9ea2b..c817d3c97 100644
--- a/src/widgets/qvbuttongroup.cpp
+++ b/src/widgets/qvbuttongroup.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qvbuttongroup.h"
+#include "ntqvbuttongroup.h"
 #ifndef QT_NO_VBUTTONGROUP
 
 /*!
-  \class TQVButtonGroup qvbuttongroup.h
+  \class TQVButtonGroup ntqvbuttongroup.h
   \brief The TQVButtonGroup widget organizes TQButton widgets in a
   vertical column.
 
diff --git a/src/widgets/qvgroupbox.cpp b/src/widgets/qvgroupbox.cpp
index 5f8b235e4..5ae77babb 100644
--- a/src/widgets/qvgroupbox.cpp
+++ b/src/widgets/qvgroupbox.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qvgroupbox.h"
+#include "ntqvgroupbox.h"
 #ifndef QT_NO_VGROUPBOX
 
 /*!
-  \class TQVGroupBox qvgroupbox.h
+  \class TQVGroupBox ntqvgroupbox.h
   \brief The TQVGroupBox widget organizes a group of widgets in a
   vertical column.
 
diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp
index 50c75fff6..55d653e92 100644
--- a/src/widgets/qwhatsthis.cpp
+++ b/src/widgets/qwhatsthis.cpp
@@ -36,23 +36,23 @@
 **
 **********************************************************************/
 
-#include "qwhatsthis.h"
+#include "ntqwhatsthis.h"
 #ifndef QT_NO_WHATSTHIS
-#include "qapplication.h"
-#include "qpaintdevicemetrics.h"
-#include "qpixmap.h"
-#include "qpainter.h"
-#include "qtimer.h"
-#include "qptrdict.h"
-#include "qtoolbutton.h"
-#include "qshared.h"
-#include "qcursor.h"
-#include "qbitmap.h"
-#include "qtooltip.h"
-#include "qsimplerichtext.h"
-#include "qstylesheet.h"
+#include "ntqapplication.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqpixmap.h"
+#include "ntqpainter.h"
+#include "ntqtimer.h"
+#include "ntqptrdict.h"
+#include "ntqtoolbutton.h"
+#include "ntqshared.h"
+#include "ntqcursor.h"
+#include "ntqbitmap.h"
+#include "ntqtooltip.h"
+#include "ntqsimplerichtext.h"
+#include "ntqstylesheet.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
@@ -62,7 +62,7 @@
 #endif
 
 /*!
-    \class TQWhatsThis qwhatsthis.h
+    \class TQWhatsThis ntqwhatsthis.h
     \brief The TQWhatsThis class provides a simple description of any
     widget, i.e. answering the question "What's this?".
 
diff --git a/src/widgets/qwidgetinterface_p.h b/src/widgets/qwidgetinterface_p.h
index 128a2771f..38505841e 100644
--- a/src/widgets/qwidgetinterface_p.h
+++ b/src/widgets/qwidgetinterface_p.h
@@ -53,7 +53,7 @@
 
 #ifndef QT_H
 #include <private/qcom_p.h>
-#include "qiconset.h"
+#include "ntqiconset.h"
 #endif // QT_H
 
 #ifndef QT_NO_WIDGETPLUGIN
diff --git a/src/widgets/qwidgetplugin.cpp b/src/widgets/qwidgetplugin.cpp
index 1cd2434d2..37b5156bb 100644
--- a/src/widgets/qwidgetplugin.cpp
+++ b/src/widgets/qwidgetplugin.cpp
@@ -38,18 +38,18 @@
 **
 **********************************************************************/
 
-#include "qwidgetplugin.h"
+#include "ntqwidgetplugin.h"
 
 #ifndef QT_NO_WIDGETPLUGIN
 #include "qwidgetinterface_p.h"
-#include "qobjectcleanuphandler.h"
-#include "qwidget.h"
+#include "ntqobjectcleanuphandler.h"
+#include "ntqwidget.h"
 #ifdef QT_CONTAINER_CUSTOM_WIDGETS
-#include "qwidgetlist.h"
+#include "ntqwidgetlist.h"
 #endif
 
 /*!
-    \class TQWidgetPlugin qwidgetplugin.h
+    \class TQWidgetPlugin ntqwidgetplugin.h
     \brief The TQWidgetPlugin class provides an abstract base for custom TQWidget plugins.
 
     \ingroup plugins
@@ -440,7 +440,7 @@ bool TQWidgetPlugin::isContainer( const TQString & ) const
 #ifdef QT_CONTAINER_CUSTOM_WIDGETS
 
 /*!
-    \class TQWidgetContainerPlugin qwidgetplugin.h
+    \class TQWidgetContainerPlugin ntqwidgetplugin.h
     \brief The TQWidgetContainerPlugin class provides an abstract base
     for complex custom container TQWidget plugins.
 
diff --git a/src/widgets/qwidgetresizehandler.cpp b/src/widgets/qwidgetresizehandler.cpp
index 2dd5383e6..ff964b12c 100644
--- a/src/widgets/qwidgetresizehandler.cpp
+++ b/src/widgets/qwidgetresizehandler.cpp
@@ -41,10 +41,10 @@
 #include "qwidgetresizehandler_p.h"
 
 #ifndef QT_NO_RESIZEHANDLER
-#include "qframe.h"
-#include "qapplication.h"
-#include "qcursor.h"
-#include "qsizegrip.h"
+#include "ntqframe.h"
+#include "ntqapplication.h"
+#include "ntqcursor.h"
+#include "ntqsizegrip.h"
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
 #endif
diff --git a/src/widgets/qwidgetresizehandler_p.h b/src/widgets/qwidgetresizehandler_p.h
index 676b53658..395e3d1eb 100644
--- a/src/widgets/qwidgetresizehandler_p.h
+++ b/src/widgets/qwidgetresizehandler_p.h
@@ -54,7 +54,7 @@
 //
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 #ifndef QT_NO_RESIZEHANDLER
 class TQMouseEvent;
diff --git a/src/widgets/qwidgetstack.cpp b/src/widgets/qwidgetstack.cpp
index 72d9e1e1a..9b80a2fdb 100644
--- a/src/widgets/qwidgetstack.cpp
+++ b/src/widgets/qwidgetstack.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qwidgetstack.h"
-#include "qlayout.h"
+#include "ntqwidgetstack.h"
+#include "ntqlayout.h"
 #include "../kernel/qlayoutengine_p.h"
 #ifndef QT_NO_WIDGETSTACK
 
-#include "qobjectlist.h"
-#include "qfocusdata.h"
-#include "qbutton.h"
-#include "qbuttongroup.h"
+#include "ntqobjectlist.h"
+#include "ntqfocusdata.h"
+#include "ntqbutton.h"
+#include "ntqbuttongroup.h"
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 
 class TQWidgetStackPrivate {
 public: