11 files changed, 29 insertions, 29 deletions
diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp
index fee5a49b7..a47604bdc 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/qprintdialog.cpp
@@ -46,18 +46,18 @@
 #include "tqfile.h"
 #include "tqtextstream.h"
 #include "tqcombobox.h"
-#include "ntqframe.h"
+#include "tqframe.h"
 #include "tqlabel.h"
 #include "tqlineedit.h"
 #include "tqpushbutton.h"
 #include "tqprinter.h"
-#include "ntqlistview.h"
+#include "tqlistview.h"
 #include "ntqlayout.h"
-#include "ntqbuttongroup.h"
+#include "tqbuttongroup.h"
 #include "tqradiobutton.h"
 #include "tqspinbox.h"
 #include "ntqapplication.h"
-#include "ntqheader.h"
+#include "tqheader.h"
 #include "tqstyle.h"
 #include "tqstring.h"
 #include "tqregexp.h"
diff --git a/src/dialogs/qt_dialogs.pri b/src/dialogs/qt_dialogs.pri
index e5c17042a..723b7ba89 100644
--- a/src/dialogs/qt_dialogs.pri
+++ b/src/dialogs/qt_dialogs.pri
@@ -9,9 +9,9 @@ dialogs {
 		  $$DIALOGS_H/tqfiledialog.h \
 		  $$DIALOGS_H/tqfontdialog.h \
 		  $$DIALOGS_H/ntqmessagebox.h \
-		  $$DIALOGS_H/ntqprogressdialog.h \
-		  $$DIALOGS_H/ntqtabdialog.h \
-		  $$DIALOGS_H/ntqwizard.h \
+		  $$DIALOGS_H/tqprogressdialog.h \
+		  $$DIALOGS_H/tqtabdialog.h \
+		  $$DIALOGS_H/tqwizard.h \
 		  $$DIALOGS_H/ntqinputdialog.h
 
         !embedded:mac:SOURCES  += $$DIALOGS_CPP/tqfiledialog_mac.cpp $$DIALOGS_CPP/tqcolordialog_mac.cpp
@@ -25,8 +25,8 @@ dialogs {
 		  $$DIALOGS_CPP/tqfiledialog.cpp \
 		  $$DIALOGS_CPP/tqfontdialog.cpp \
 		  $$DIALOGS_CPP/qmessagebox.cpp \
-		  $$DIALOGS_CPP/qprogressdialog.cpp \
-		  $$DIALOGS_CPP/qtabdialog.cpp \
-		  $$DIALOGS_CPP/qwizard.cpp \
+		  $$DIALOGS_CPP/tqprogressdialog.cpp \
+		  $$DIALOGS_CPP/tqtabdialog.cpp \
+		  $$DIALOGS_CPP/tqwizard.cpp \
 		  $$DIALOGS_CPP/qinputdialog.cpp
 }
diff --git a/src/dialogs/tqcolordialog.cpp b/src/dialogs/tqcolordialog.cpp
index 95b7145c8..a92f3af5d 100644
--- a/src/dialogs/tqcolordialog.cpp
+++ b/src/dialogs/tqcolordialog.cpp
@@ -52,7 +52,7 @@
 #include "ntqdrawutil.h"
 #include "ntqvalidator.h"
 #include "tqdragobject.h"
-#include "ntqgridview.h"
+#include "tqgridview.h"
 #include "ntqapplication.h"
 #include "tqstyle.h"
 #include "tqsettings.h"
diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp
index 27ec5d130..5ac7307a0 100644
--- a/src/dialogs/tqfiledialog.cpp
+++ b/src/dialogs/tqfiledialog.cpp
@@ -57,7 +57,7 @@
 #include "private/qapplication_p.h"
 #include "ntqapplication.h"
 #include "tqbitmap.h"
-#include "ntqbuttongroup.h"
+#include "tqbuttongroup.h"
 #include "tqcheckbox.h"
 #include "ntqcleanuphandler.h"
 #include "tqcombobox.h"
@@ -67,13 +67,13 @@
 #include "tqfile.h"
 #include "ntqguardedptr.h"
 #include "ntqhbox.h"
-#include "ntqheader.h"
+#include "tqheader.h"
 #include "tqlabel.h"
 #include "ntqlayout.h"
 #include "ntqlibrary.h"
 #include "tqlineedit.h"
-#include "ntqlistbox.h"
-#include "ntqlistview.h"
+#include "tqlistbox.h"
+#include "tqlistview.h"
 #include "tqmap.h"
 #include "ntqmessagebox.h"
 #include "tqmime.h"
@@ -81,7 +81,7 @@
 #include "tqobjectlist.h"
 #include "tqpainter.h"
 #include "tqpopupmenu.h"
-#include "ntqprogressbar.h"
+#include "tqprogressbar.h"
 #include "tqptrvector.h"
 #include "tqpushbutton.h"
 #include "tqregexp.h"
diff --git a/src/dialogs/tqfontdialog.cpp b/src/dialogs/tqfontdialog.cpp
index e13083b3a..8ea7e9ea0 100644
--- a/src/dialogs/tqfontdialog.cpp
+++ b/src/dialogs/tqfontdialog.cpp
@@ -45,7 +45,7 @@
 #include "tqfontdialog.h"
 
 #include "tqlineedit.h"
-#include "ntqlistbox.h"
+#include "tqlistbox.h"
 #include "tqpushbutton.h"
 #include "tqcheckbox.h"
 #include "tqcombobox.h"
diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/tqprogressdialog.cpp
index 9c74a906e..5731fd240 100644
--- a/src/dialogs/qprogressdialog.cpp
+++ b/src/dialogs/tqprogressdialog.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqprogressdialog.h"
+#include "tqprogressdialog.h"
 
 #ifndef TQT_NO_PROGRESSDIALOG
 
@@ -100,7 +100,7 @@ public:
 
 
 /*!
-  \class TQProgressDialog ntqprogressdialog.h
+  \class TQProgressDialog tqprogressdialog.h
   \brief The TQProgressDialog class provides feedback on the progress of a slow operation.
   \ingroup dialogs
   \mainclass
diff --git a/src/dialogs/ntqprogressdialog.h b/src/dialogs/tqprogressdialog.h
index af20f615b..628d6de19 100644
--- a/src/dialogs/ntqprogressdialog.h
+++ b/src/dialogs/tqprogressdialog.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqdialog.h"
 #include "tqlabel.h"       // ### remove or keep for users' convenience?
-#include "ntqprogressbar.h" // ### remove or keep for users' convenience?
+#include "tqprogressbar.h" // ### remove or keep for users' convenience?
 #endif // QT_H
 
 #ifndef TQT_NO_PROGRESSDIALOG
diff --git a/src/dialogs/qtabdialog.cpp b/src/dialogs/tqtabdialog.cpp
index db439d93f..0d00244e0 100644
--- a/src/dialogs/qtabdialog.cpp
+++ b/src/dialogs/tqtabdialog.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "ntqtabdialog.h"
+#include "tqtabdialog.h"
 
 #ifndef TQT_NO_TABDIALOG
 
 #include "tqobjectlist.h"
-#include "ntqtabbar.h"
-#include "ntqtabwidget.h"
+#include "tqtabbar.h"
+#include "tqtabwidget.h"
 #include "tqpushbutton.h"
 #include "tqpainter.h"
 #include "tqpixmap.h"
 #include "ntqapplication.h"
-#include "ntqtabwidget.h"
+#include "tqtabwidget.h"
 #include "tqwidgetstack.h"
 #include "ntqlayout.h"
 
 /*!
-  \class TQTabDialog ntqtabdialog.h
+  \class TQTabDialog tqtabdialog.h
 
   \brief The TQTabDialog class provides a stack of tabbed widgets.
 
@@ -129,7 +129,7 @@
 
   Most of the functionality in TQTabDialog is provided by a TQTabWidget.
 
-  <img src=qtabdlg-m.png> <img src=qtabdlg-w.png>
+  <img src=tqtabdlg-m.png> <img src=tqtabdlg-w.png>
 
   \sa TQDialog
 */
diff --git a/src/dialogs/ntqtabdialog.h b/src/dialogs/tqtabdialog.h
index 61e4287c6..61e4287c6 100644
--- a/src/dialogs/ntqtabdialog.h
+++ b/src/dialogs/tqtabdialog.h
diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/tqwizard.cpp
index ef3b4e8f4..2b4c46682 100644
--- a/src/dialogs/qwizard.cpp
+++ b/src/dialogs/tqwizard.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqwizard.h"
+#include "tqwizard.h"
 
 #ifndef TQT_NO_WIZARD
 
@@ -56,7 +56,7 @@
 /*! \file wizard/wizard.h */
 
 /*!
-    \class TQWizard ntqwizard.h
+    \class TQWizard tqwizard.h
     \brief The TQWizard class provides a framework for wizard dialogs.
 
     \ingroup abstractwidgets
@@ -100,7 +100,7 @@
 
     Example code is available here: \l wizard/wizard.cpp \l wizard/wizard.h
 
-    \img qwizard.png A TQWizard page
+    \img tqwizard.png A TQWizard page
     \caption A TQWizard page
 
 */
diff --git a/src/dialogs/ntqwizard.h b/src/dialogs/tqwizard.h
index c680e2860..c680e2860 100644
--- a/src/dialogs/ntqwizard.h
+++ b/src/dialogs/tqwizard.h