Update to latest tqt3 automated conversion

24 files changed, 213 insertions, 213 deletions

diff --git a/src/dialogs/qcolordialog.h b/src/dialogs/ntqcolordialog.h
index 28c8ee1c0..c3490ef53 100644
--- a/src/dialogs/qcolordialog.h
+++ b/src/dialogs/ntqcolordialog.h
@@ -42,7 +42,7 @@
 #define TQCOLORDIALOG_H
 
 #ifndef QT_H
-#include "qdialog.h"
+#include "ntqdialog.h"
 #endif // QT_H
 
 #ifndef QT_NO_COLORDIALOG
diff --git a/src/dialogs/qdialog.h b/src/dialogs/ntqdialog.h
index 068b4d360..bc9670af6 100644
--- a/src/dialogs/qdialog.h
+++ b/src/dialogs/ntqdialog.h
@@ -42,7 +42,7 @@
 #define TQDIALOG_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 #ifndef QT_NO_DIALOG
 #if 0
diff --git a/src/dialogs/qerrormessage.h b/src/dialogs/ntqerrormessage.h
index fffb7c73b..91634fbf7 100644
--- a/src/dialogs/qerrormessage.h
+++ b/src/dialogs/ntqerrormessage.h
@@ -42,7 +42,7 @@
 #define TQERRORMESSAGE_H
 
 #ifndef QT_H
-#include "qdialog.h"
+#include "ntqdialog.h"
 #endif // QT_H
 
 #ifndef QT_NO_ERRORMESSAGE
diff --git a/src/dialogs/qfiledialog.h b/src/dialogs/ntqfiledialog.h
index ee13267e5..cc811b636 100644
--- a/src/dialogs/qfiledialog.h
+++ b/src/dialogs/ntqfiledialog.h
@@ -55,10 +55,10 @@ class TQFileDialogPrivate;
 class TQFileDialogTQFileListView;
 
 #ifndef QT_H
-#include "qdir.h"
-#include "qdialog.h"
-#include "qurloperator.h"
-#include "qurlinfo.h"
+#include "ntqdir.h"
+#include "ntqdialog.h"
+#include "ntqurloperator.h"
+#include "ntqurlinfo.h"
 #endif // QT_H
 
 #if __GNUC__ - 0 > 3
diff --git a/src/dialogs/qfontdialog.h b/src/dialogs/ntqfontdialog.h
index 53e625f23..bcb5e06dc 100644
--- a/src/dialogs/qfontdialog.h
+++ b/src/dialogs/ntqfontdialog.h
@@ -41,7 +41,7 @@
 #ifndef TQFONTDIALOG_H
 #define TQFONTDIALOG_H
 
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 
 #ifndef QT_NO_FONTDIALOG
 
@@ -56,8 +56,8 @@
 //
 
 #ifndef QT_H
-#include "qdialog.h"
-#include "qfont.h"
+#include "ntqdialog.h"
+#include "ntqfont.h"
 #endif // QT_H
 
 class TQFontDialogPrivate;
diff --git a/src/dialogs/qinputdialog.h b/src/dialogs/ntqinputdialog.h
index 96db6e557..7b21503bb 100644
--- a/src/dialogs/qinputdialog.h
+++ b/src/dialogs/ntqinputdialog.h
@@ -42,9 +42,9 @@
 #define TQINPUTDIALOG_H
 
 #ifndef QT_H
-#include "qdialog.h"
-#include "qstring.h"
-#include "qlineedit.h"
+#include "ntqdialog.h"
+#include "ntqstring.h"
+#include "ntqlineedit.h"
 #endif // QT_H
 
 #ifndef QT_NO_INPUTDIALOG
diff --git a/src/dialogs/qmessagebox.h b/src/dialogs/ntqmessagebox.h
index 65a7b6244..5ab38f78c 100644
--- a/src/dialogs/qmessagebox.h
+++ b/src/dialogs/ntqmessagebox.h
@@ -42,7 +42,7 @@
 #define TQMESSAGEBOX_H
 
 #ifndef QT_H
-#include "qdialog.h"
+#include "ntqdialog.h"
 #endif // QT_H
 
 #ifndef QT_NO_MESSAGEBOX
@@ -200,8 +200,8 @@ private:	// Disabled copy constructor and operator=
 /*
 *  Macro to be used at the beginning of main(), e.g.
 *
-*   #include <qapplication.h>
-*   #include <qmessagebox.h>
+*   #include <ntqapplication.h>
+*   #include <ntqmessagebox.h>
 *   int main( int argc, char**argv )
 *   {
 *     QT_REQUIRE_VERSION( argc, argv, "3.0.5" )
diff --git a/src/dialogs/qprintdialog.h b/src/dialogs/ntqprintdialog.h
index 4d411850a..ea46c6fed 100644
--- a/src/dialogs/qprintdialog.h
+++ b/src/dialogs/ntqprintdialog.h
@@ -42,7 +42,7 @@
 #define TQPRINTDIALOG_H
 
 #ifndef QT_H
-#include "qdialog.h"
+#include "ntqdialog.h"
 #endif // QT_H
 
 #ifndef QT_NO_PRINTDIALOG
diff --git a/src/dialogs/qprogressdialog.h b/src/dialogs/ntqprogressdialog.h
index 13b3129a8..e480f2862 100644
--- a/src/dialogs/qprogressdialog.h
+++ b/src/dialogs/ntqprogressdialog.h
@@ -42,9 +42,9 @@
 #define TQPROGRESSDIALOG_H
 
 #ifndef QT_H
-#include "qsemimodal.h"
-#include "qlabel.h"       // ### remove or keep for users' convenience?
-#include "qprogressbar.h" // ### remove or keep for users' convenience?
+#include "ntqsemimodal.h"
+#include "ntqlabel.h"       // ### remove or keep for users' convenience?
+#include "ntqprogressbar.h" // ### remove or keep for users' convenience?
 #endif // QT_H
 
 #ifndef QT_NO_PROGRESSDIALOG
diff --git a/src/dialogs/qsemimodal.h b/src/dialogs/ntqsemimodal.h
index 580b97bd9..ff015b7f6 100644
--- a/src/dialogs/qsemimodal.h
+++ b/src/dialogs/ntqsemimodal.h
@@ -42,7 +42,7 @@
 #define TQSEMIMODAL_H
 
 #ifndef QT_H
-#include "qdialog.h"
+#include "ntqdialog.h"
 #endif // QT_H
 
 #ifndef QT_NO_COMPAT
diff --git a/src/dialogs/qtabdialog.h b/src/dialogs/ntqtabdialog.h
index 6391f6630..216225289 100644
--- a/src/dialogs/qtabdialog.h
+++ b/src/dialogs/ntqtabdialog.h
@@ -42,8 +42,8 @@
 #define TQTABDIALOG_H
 
 #ifndef QT_H
-#include "qdialog.h"
-#include "qiconset.h"
+#include "ntqdialog.h"
+#include "ntqiconset.h"
 #endif // QT_H
 
 #ifndef QT_NO_TABDIALOG
diff --git a/src/dialogs/qwizard.h b/src/dialogs/ntqwizard.h
index 04754fb7b..b366f29ca 100644
--- a/src/dialogs/qwizard.h
+++ b/src/dialogs/ntqwizard.h
@@ -43,7 +43,7 @@
 
 
 #ifndef QT_H
-#include "qdialog.h"
+#include "ntqdialog.h"
 #endif // QT_H
 
 #ifndef QT_NO_WIZARD
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp
index 0a3be03fb..e275f02b9 100644
--- a/src/dialogs/qcolordialog.cpp
+++ b/src/dialogs/qcolordialog.cpp
@@ -38,25 +38,25 @@
 **
 **********************************************************************/
 
-#include "qcolordialog.h"
+#include "ntqcolordialog.h"
 
 #ifndef QT_NO_COLORDIALOG
 
-#include "qpainter.h"
-#include "qlayout.h"
-#include "qlabel.h"
-#include "qpushbutton.h"
-#include "qlineedit.h"
-#include "qimage.h"
-#include "qpixmap.h"
-#include "qdrawutil.h"
-#include "qvalidator.h"
-#include "qdragobject.h"
-#include "qgridview.h"
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qsettings.h"
-#include "qpopupmenu.h"
+#include "ntqpainter.h"
+#include "ntqlayout.h"
+#include "ntqlabel.h"
+#include "ntqpushbutton.h"
+#include "ntqlineedit.h"
+#include "ntqimage.h"
+#include "ntqpixmap.h"
+#include "ntqdrawutil.h"
+#include "ntqvalidator.h"
+#include "ntqdragobject.h"
+#include "ntqgridview.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqsettings.h"
+#include "ntqpopupmenu.h"
 
 #ifdef Q_WS_MAC
 TQRgb macGetRgba( TQRgb initial, bool *ok, TQWidget *parent, const char* name );
@@ -1416,7 +1416,7 @@ void TQColorDialogPrivate::addCustom()
 
 
 /*!
-    \class TQColorDialog qcolordialog.h
+    \class TQColorDialog ntqcolordialog.h
     \brief The TQColorDialog class provides a dialog widget for specifying colors.
     \mainclass
     \ingroup dialogs
diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp
index 4f99ae9e6..1ef49e0c0 100644
--- a/src/dialogs/qdialog.cpp
+++ b/src/dialogs/qdialog.cpp
@@ -38,22 +38,22 @@
 **
 **********************************************************************/
 
-#include "qdialog.h"
+#include "ntqdialog.h"
 
 #ifndef QT_NO_DIALOG
 
-#include "qpushbutton.h"
-#include "qfocusdata.h"
-#include "qapplication.h"
-#include "qobjectlist.h"
-#include "qwidgetlist.h"
-#include "qlayout.h"
-#include "qsizegrip.h"
-#include "qwhatsthis.h"
-#include "qpopupmenu.h"
-#include "qcursor.h"
+#include "ntqpushbutton.h"
+#include "ntqfocusdata.h"
+#include "ntqapplication.h"
+#include "ntqobjectlist.h"
+#include "ntqwidgetlist.h"
+#include "ntqlayout.h"
+#include "ntqsizegrip.h"
+#include "ntqwhatsthis.h"
+#include "ntqpopupmenu.h"
+#include "ntqcursor.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 #if defined( Q_OS_TEMP )
 #include "qt_windows.h"
@@ -344,7 +344,7 @@ void TQDialog::hideDefault()
   Hides special buttons which are rather shown in the titlebar
   on WinCE, to conserve screen space.
 */
-# include "qmessagebox.h"
+# include "ntqmessagebox.h"
 extern const char * mb_texts[]; // Defined in qmessagebox.cpp
 void TQDialog::hideSpecial()
 {
diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp
index 7352ee641..a33872bb8 100644
--- a/src/dialogs/qerrormessage.cpp
+++ b/src/dialogs/qerrormessage.cpp
@@ -38,20 +38,20 @@
 **
 **********************************************************************/
 
-#include "qerrormessage.h"
+#include "ntqerrormessage.h"
 
 #ifndef QT_NO_ERRORMESSAGE
 
-#include "qapplication.h"
-#include "qcheckbox.h"
-#include "qdict.h"
-#include "qlabel.h"
-#include "qlayout.h"
-#include "qmessagebox.h"
-#include "qpushbutton.h"
-#include "qstringlist.h"
-#include "qstylesheet.h"
-#include "qtextview.h"
+#include "ntqapplication.h"
+#include "ntqcheckbox.h"
+#include "ntqdict.h"
+#include "ntqlabel.h"
+#include "ntqlayout.h"
+#include "ntqmessagebox.h"
+#include "ntqpushbutton.h"
+#include "ntqstringlist.h"
+#include "ntqstylesheet.h"
+#include "ntqtextview.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index c9032f853..cfa6dd39d 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -50,50 +50,50 @@
 # undef truncate
 #endif
 
-#include "qfiledialog.h"
+#include "ntqfiledialog.h"
 
 #ifndef QT_NO_FILEDIALOG
 
 #include "private/qapplication_p.h"
-#include "qapplication.h"
-#include "qbitmap.h"
-#include "qbuttongroup.h"
-#include "qcheckbox.h"
-#include "qcleanuphandler.h"
-#include "qcombobox.h"
-#include "qcstring.h"
-#include "qcursor.h"
-#include "qdragobject.h"
-#include "qfile.h"
-#include "qguardedptr.h"
-#include "qhbox.h"
-#include "qheader.h"
-#include "qlabel.h"
-#include "qlayout.h"
-#include "qlibrary.h"
-#include "qlineedit.h"
-#include "qlistbox.h"
-#include "qlistview.h"
-#include "qmap.h"
-#include "qmessagebox.h"
-#include "qmime.h"
-#include "qnetworkprotocol.h"
-#include "qobjectlist.h"
-#include "qpainter.h"
-#include "qpopupmenu.h"
-#include "qprogressbar.h"
-#include "qptrvector.h"
-#include "qpushbutton.h"
-#include "qregexp.h"
-#include "qsemimodal.h"
-#include "qsplitter.h"
-#include "qstrlist.h"
-#include "qstyle.h"
-#include "qtimer.h"
-#include "qtoolbutton.h"
-#include "qtooltip.h"
-#include "qvbox.h"
-#include "qwidgetstack.h"
+#include "ntqapplication.h"
+#include "ntqbitmap.h"
+#include "ntqbuttongroup.h"
+#include "ntqcheckbox.h"
+#include "ntqcleanuphandler.h"
+#include "ntqcombobox.h"
+#include "ntqcstring.h"
+#include "ntqcursor.h"
+#include "ntqdragobject.h"
+#include "ntqfile.h"
+#include "ntqguardedptr.h"
+#include "ntqhbox.h"
+#include "ntqheader.h"
+#include "ntqlabel.h"
+#include "ntqlayout.h"
+#include "ntqlibrary.h"
+#include "ntqlineedit.h"
+#include "ntqlistbox.h"
+#include "ntqlistview.h"
+#include "ntqmap.h"
+#include "ntqmessagebox.h"
+#include "ntqmime.h"
+#include "ntqnetworkprotocol.h"
+#include "ntqobjectlist.h"
+#include "ntqpainter.h"
+#include "ntqpopupmenu.h"
+#include "ntqprogressbar.h"
+#include "ntqptrvector.h"
+#include "ntqpushbutton.h"
+#include "ntqregexp.h"
+#include "ntqsemimodal.h"
+#include "ntqsplitter.h"
+#include "ntqstrlist.h"
+#include "ntqstyle.h"
+#include "ntqtimer.h"
+#include "ntqtoolbutton.h"
+#include "ntqtooltip.h"
+#include "ntqvbox.h"
+#include "ntqwidgetstack.h"
 
 #ifdef Q_WS_X11
 #include "private/qtkdeintegration_x11_p.h"
@@ -2164,7 +2164,7 @@ static TQStringList makeFiltersList( const TQString &filter )
 }
 
 /*!
-  \class TQFileDialog qfiledialog.h
+  \class TQFileDialog ntqfiledialog.h
   \brief The TQFileDialog class provides dialogs that allow users to select files or directories.
   \ingroup dialogs
   \mainclass
@@ -4968,7 +4968,7 @@ void TQFileDialog::keyPressEvent( TQKeyEvent * ke )
 }
 
 
-/*! \class TQFileIconProvider qfiledialog.h
+/*! \class TQFileIconProvider ntqfiledialog.h
 
   \brief The TQFileIconProvider class provides icons for TQFileDialog to
   use.
@@ -6445,7 +6445,7 @@ void TQFileDialog::goBack()
 // preview widget from TQWidget and from this class' indeed.
 
 /*!
-  \class TQFilePreview qfiledialog.h
+  \class TQFilePreview ntqfiledialog.h
   \ingroup misc
   \brief The TQFilePreview class provides file previewing in TQFileDialog.
 
diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp
index 317a2ec1e..48ecb3d61 100644
--- a/src/dialogs/qfontdialog.cpp
+++ b/src/dialogs/qfontdialog.cpp
@@ -38,33 +38,33 @@
 **
 **********************************************************************/
 
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 
 #ifndef QT_NO_FONTDIALOG
 
-#include "qfontdialog.h"
-
-#include "qlineedit.h"
-#include "qlistbox.h"
-#include "qpushbutton.h"
-#include "qcheckbox.h"
-#include "qcombobox.h"
-#include "qlayout.h"
-#include "qvgroupbox.h"
-#include "qhgroupbox.h"
-#include "qlabel.h"
-#include "qapplication.h"
-#include "qfontdatabase.h"
-#include "qstyle.h"
+#include "ntqfontdialog.h"
+
+#include "ntqlineedit.h"
+#include "ntqlistbox.h"
+#include "ntqpushbutton.h"
+#include "ntqcheckbox.h"
+#include "ntqcombobox.h"
+#include "ntqlayout.h"
+#include "ntqvgroupbox.h"
+#include "ntqhgroupbox.h"
+#include "ntqlabel.h"
+#include "ntqapplication.h"
+#include "ntqfontdatabase.h"
+#include "ntqstyle.h"
 #include <private/qfontdata_p.h>
-#include <qvalidator.h>
+#include <ntqvalidator.h>
 
 #ifdef Q_WS_X11
 #include "private/qtkdeintegration_x11_p.h"
 #endif
 
 /*!
-  \class TQFontDialog qfontdialog.h
+  \class TQFontDialog ntqfontdialog.h
   \ingroup dialogs
   \mainclass
   \brief The TQFontDialog class provides a dialog widget for selecting a font.
@@ -470,7 +470,7 @@ bool TQFontDialog::eventFilter( TQObject * o , TQEvent * e )
 #endif
 
 #ifdef SHOW_FONTS_IN_FAMILIES
-#include "qpainter.h"
+#include "ntqpainter.h"
 #include <sizeedit.h>
 
 class TQListBoxFontText : public TQListBoxText
diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp
index a75d24b5c..7b285da97 100644
--- a/src/dialogs/qinputdialog.cpp
+++ b/src/dialogs/qinputdialog.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qinputdialog.h"
+#include "ntqinputdialog.h"
 
 #ifndef QT_NO_INPUTDIALOG
 
-#include "qlayout.h"
-#include "qlabel.h"
-#include "qlineedit.h"
-#include "qpushbutton.h"
-#include "qspinbox.h"
-#include "qcombobox.h"
-#include "qwidgetstack.h"
-#include "qvalidator.h"
-#include "qapplication.h"
+#include "ntqlayout.h"
+#include "ntqlabel.h"
+#include "ntqlineedit.h"
+#include "ntqpushbutton.h"
+#include "ntqspinbox.h"
+#include "ntqcombobox.h"
+#include "ntqwidgetstack.h"
+#include "ntqvalidator.h"
+#include "ntqapplication.h"
 
 class TQInputDialogPrivate
 {
diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp
index e0545de32..fc902b5a0 100644
--- a/src/dialogs/qmessagebox.cpp
+++ b/src/dialogs/qmessagebox.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qmessagebox.h"
+#include "ntqmessagebox.h"
 
 #ifndef QT_NO_MESSAGEBOX
 
-#include "qaccel.h"
-#include "qlabel.h"
-#include "qpushbutton.h"
-#include "qimage.h"
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qobjectlist.h"
+#include "ntqaccel.h"
+#include "ntqlabel.h"
+#include "ntqpushbutton.h"
+#include "ntqimage.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqobjectlist.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 #if defined QT_NON_COMMERCIAL
 #include "qnc_win.h"
diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp
index 0e00609e4..f46d1a5e6 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/qprintdialog.cpp
@@ -38,31 +38,31 @@
 **
 **********************************************************************/
 
-#include "qprintdialog.h"
+#include "ntqprintdialog.h"
 
 #ifndef QT_NO_PRINTDIALOG
 
-#include "qfiledialog.h"
-#include "qfile.h"
-#include "qtextstream.h"
-#include "qcombobox.h"
-#include "qframe.h"
-#include "qlabel.h"
-#include "qlineedit.h"
-#include "qpushbutton.h"
-#include "qprinter.h"
-#include "qlistview.h"
-#include "qlayout.h"
-#include "qbuttongroup.h"
-#include "qradiobutton.h"
-#include "qspinbox.h"
-#include "qapplication.h"
-#include "qheader.h"
-#include "qstyle.h"
-#include "qstring.h"
-#include "qregexp.h"
+#include "ntqfiledialog.h"
+#include "ntqfile.h"
+#include "ntqtextstream.h"
+#include "ntqcombobox.h"
+#include "ntqframe.h"
+#include "ntqlabel.h"
+#include "ntqlineedit.h"
+#include "ntqpushbutton.h"
+#include "ntqprinter.h"
+#include "ntqlistview.h"
+#include "ntqlayout.h"
+#include "ntqbuttongroup.h"
+#include "ntqradiobutton.h"
+#include "ntqspinbox.h"
+#include "ntqapplication.h"
+#include "ntqheader.h"
+#include "ntqstyle.h"
+#include "ntqstring.h"
+#include "ntqregexp.h"
 #if !defined(QT_NO_CUPS) || !defined(QT_NO_NIS)
-#include "qlibrary.h"
+#include "ntqlibrary.h"
 #endif
 
 #ifndef QT_NO_NIS
@@ -825,7 +825,7 @@ static void qpd_cleanup_globaldialog()
 }
 
 /*!
-  \class TQPrintDialog qprintdialog.h
+  \class TQPrintDialog ntqprintdialog.h
 
   \brief The TQPrintDialog class provides a dialog for specifying
   the printer's configuration.
diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp
index a0f63467e..d29b4c581 100644
--- a/src/dialogs/qprogressdialog.cpp
+++ b/src/dialogs/qprogressdialog.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qprogressdialog.h"
+#include "ntqprogressdialog.h"
 
 #ifndef QT_NO_PROGRESSDIALOG
 
-#include "qaccel.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qdatetime.h"
-#include "qapplication.h"
-#include "qstyle.h"
-#include "qpushbutton.h"
-#include "qcursor.h"
-#include "qtimer.h"
+#include "ntqaccel.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqdatetime.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
+#include "ntqpushbutton.h"
+#include "ntqcursor.h"
+#include "ntqtimer.h"
 #include <limits.h>
 
 // If the operation is expected to take this long (as predicted by
@@ -100,7 +100,7 @@ public:
 
 
 /*!
-  \class TQProgressDialog qprogressdialog.h
+  \class TQProgressDialog ntqprogressdialog.h
   \brief The TQProgressDialog class provides feedback on the progress of a slow operation.
   \ingroup dialogs
   \mainclass
diff --git a/src/dialogs/qt_dialogs.pri b/src/dialogs/qt_dialogs.pri
index 9bd899205..deada26e9 100644
--- a/src/dialogs/qt_dialogs.pri
+++ b/src/dialogs/qt_dialogs.pri
@@ -3,22 +3,22 @@
 dialogs {
 	DIALOGS_P	= dialogs
 
-	HEADERS	+= $$DIALOGS_H/qcolordialog.h \
-		  $$DIALOGS_H/qdialog.h \
-		  $$DIALOGS_H/qerrormessage.h \
-		  $$DIALOGS_H/qfiledialog.h \
-		  $$DIALOGS_H/qfontdialog.h \
-		  $$DIALOGS_H/qmessagebox.h \
-		  $$DIALOGS_H/qprogressdialog.h \
-		  $$DIALOGS_H/qsemimodal.h \
-		  $$DIALOGS_H/qtabdialog.h \
-		  $$DIALOGS_H/qwizard.h \
-		  $$DIALOGS_H/qinputdialog.h
+	HEADERS	+= $$DIALOGS_H/ntqcolordialog.h \
+		  $$DIALOGS_H/ntqdialog.h \
+		  $$DIALOGS_H/ntqerrormessage.h \
+		  $$DIALOGS_H/ntqfiledialog.h \
+		  $$DIALOGS_H/ntqfontdialog.h \
+		  $$DIALOGS_H/ntqmessagebox.h \
+		  $$DIALOGS_H/ntqprogressdialog.h \
+		  $$DIALOGS_H/ntqsemimodal.h \
+		  $$DIALOGS_H/ntqtabdialog.h \
+		  $$DIALOGS_H/ntqwizard.h \
+		  $$DIALOGS_H/ntqinputdialog.h
 
         !embedded:mac:SOURCES  += $$DIALOGS_CPP/qfiledialog_mac.cpp $$DIALOGS_CPP/qcolordialog_mac.cpp
 	win32:SOURCES += $$DIALOGS_CPP/qfiledialog_win.cpp
 	unix:SOURCES += $$DIALOGS_CPP/qprintdialog.cpp
-	unix:HEADERS   += $$DIALOGS_H/qprintdialog.h 
+	unix:HEADERS   += $$DIALOGS_H/ntqprintdialog.h 
 
 	SOURCES += $$DIALOGS_CPP/qcolordialog.cpp \
 		  $$DIALOGS_CPP/qdialog.cpp \
diff --git a/src/dialogs/qtabdialog.cpp b/src/dialogs/qtabdialog.cpp
index 8360158b0..2315e4ac1 100644
--- a/src/dialogs/qtabdialog.cpp
+++ b/src/dialogs/qtabdialog.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "qtabdialog.h"
+#include "ntqtabdialog.h"
 
 #ifndef QT_NO_TABDIALOG
 
-#include "qobjectlist.h"
-#include "qtabbar.h"
-#include "qtabwidget.h"
-#include "qpushbutton.h"
-#include "qpainter.h"
-#include "qpixmap.h"
-#include "qapplication.h"
-#include "qtabwidget.h"
-#include "qwidgetstack.h"
-#include "qlayout.h"
+#include "ntqobjectlist.h"
+#include "ntqtabbar.h"
+#include "ntqtabwidget.h"
+#include "ntqpushbutton.h"
+#include "ntqpainter.h"
+#include "ntqpixmap.h"
+#include "ntqapplication.h"
+#include "ntqtabwidget.h"
+#include "ntqwidgetstack.h"
+#include "ntqlayout.h"
 
 /*!
-  \class TQTabDialog qtabdialog.h
+  \class TQTabDialog ntqtabdialog.h
 
   \brief The TQTabDialog class provides a stack of tabbed widgets.
 
diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp
index 3b79098fc..8ab1d13c2 100644
--- a/src/dialogs/qwizard.cpp
+++ b/src/dialogs/qwizard.cpp
@@ -38,25 +38,25 @@
 **
 **********************************************************************/
 
-#include "qwizard.h"
+#include "ntqwizard.h"
 
 #ifndef QT_NO_WIZARD
 
-#include "qlayout.h"
-#include "qpushbutton.h"
-#include "qcursor.h"
-#include "qlabel.h"
-#include "qwidgetstack.h"
-#include "qapplication.h"
-#include "qptrlist.h"
-#include "qpainter.h"
-#include "qaccel.h"
+#include "ntqlayout.h"
+#include "ntqpushbutton.h"
+#include "ntqcursor.h"
+#include "ntqlabel.h"
+#include "ntqwidgetstack.h"
+#include "ntqapplication.h"
+#include "ntqptrlist.h"
+#include "ntqpainter.h"
+#include "ntqaccel.h"
 
 /*! \file wizard/wizard.cpp */
 /*! \file wizard/wizard.h */
 
 /*!
-    \class TQWizard qwizard.h
+    \class TQWizard ntqwizard.h
     \brief The TQWizard class provides a framework for wizard dialogs.
 
     \ingroup abstractwidgets