9 files changed, 21 insertions, 21 deletions
diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp
index 1202d4b76..0527f17d2 100644
--- a/src/dialogs/qprogressdialog.cpp
+++ b/src/dialogs/qprogressdialog.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_PROGRESSDIALOG
 
 #include "ntqaccel.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h"
 #include "tqdatetime.h"
 #include "ntqapplication.h"
diff --git a/src/dialogs/qt_dialogs.pri b/src/dialogs/qt_dialogs.pri
index cfd0f5b06..669dd70a4 100644
--- a/src/dialogs/qt_dialogs.pri
+++ b/src/dialogs/qt_dialogs.pri
@@ -3,27 +3,27 @@
 dialogs {
 	DIALOGS_P	= dialogs
 
-	HEADERS	+= $$DIALOGS_H/ntqcolordialog.h \
+	HEADERS	+= $$DIALOGS_H/tqcolordialog.h \
 		  $$DIALOGS_H/ntqdialog.h \
 		  $$DIALOGS_H/ntqerrormessage.h \
 		  $$DIALOGS_H/tqfiledialog.h \
-		  $$DIALOGS_H/ntqfontdialog.h \
+		  $$DIALOGS_H/tqfontdialog.h \
 		  $$DIALOGS_H/ntqmessagebox.h \
 		  $$DIALOGS_H/ntqprogressdialog.h \
 		  $$DIALOGS_H/ntqtabdialog.h \
 		  $$DIALOGS_H/ntqwizard.h \
 		  $$DIALOGS_H/ntqinputdialog.h
 
-        !embedded:mac:SOURCES  += $$DIALOGS_CPP/tqfiledialog_mac.cpp $$DIALOGS_CPP/qcolordialog_mac.cpp
+        !embedded:mac:SOURCES  += $$DIALOGS_CPP/tqfiledialog_mac.cpp $$DIALOGS_CPP/tqcolordialog_mac.cpp
 	win32:SOURCES += $$DIALOGS_CPP/tqfiledialog_win.cpp
 	unix:SOURCES += $$DIALOGS_CPP/qprintdialog.cpp
 	unix:HEADERS   += $$DIALOGS_H/ntqprintdialog.h 
 
-	SOURCES += $$DIALOGS_CPP/qcolordialog.cpp \
+	SOURCES += $$DIALOGS_CPP/tqcolordialog.cpp \
 		  $$DIALOGS_CPP/qdialog.cpp \
 		  $$DIALOGS_CPP/qerrormessage.cpp \
 		  $$DIALOGS_CPP/tqfiledialog.cpp \
-		  $$DIALOGS_CPP/qfontdialog.cpp \
+		  $$DIALOGS_CPP/tqfontdialog.cpp \
 		  $$DIALOGS_CPP/qmessagebox.cpp \
 		  $$DIALOGS_CPP/qprogressdialog.cpp \
 		  $$DIALOGS_CPP/qtabdialog.cpp \
diff --git a/src/dialogs/qtabdialog.cpp b/src/dialogs/qtabdialog.cpp
index f2601cca2..d0aa11e05 100644
--- a/src/dialogs/qtabdialog.cpp
+++ b/src/dialogs/qtabdialog.cpp
@@ -46,7 +46,7 @@
 #include "ntqtabbar.h"
 #include "ntqtabwidget.h"
 #include "ntqpushbutton.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqpixmap.h"
 #include "ntqapplication.h"
 #include "ntqtabwidget.h"
diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp
index e5b3f8f46..3f8371ea7 100644
--- a/src/dialogs/qwizard.cpp
+++ b/src/dialogs/qwizard.cpp
@@ -49,7 +49,7 @@
 #include "tqwidgetstack.h"
 #include "ntqapplication.h"
 #include "tqptrlist.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqaccel.h"
 
 /*! \file wizard/wizard.cpp */
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/tqcolordialog.cpp
index 4f82b6350..09040eef3 100644
--- a/src/dialogs/qcolordialog.cpp
+++ b/src/dialogs/tqcolordialog.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "ntqcolordialog.h"
+#include "tqcolordialog.h"
 
 #ifndef TQT_NO_COLORDIALOG
 
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqlayout.h"
 #include "ntqlabel.h"
 #include "ntqpushbutton.h"
@@ -1416,7 +1416,7 @@ void TQColorDialogPrivate::addCustom()
 
 
 /*!
-    \class TQColorDialog ntqcolordialog.h
+    \class TQColorDialog tqcolordialog.h
     \brief The TQColorDialog class provides a dialog widget for specifying colors.
     \mainclass
     \ingroup dialogs
@@ -1441,7 +1441,7 @@ void TQColorDialogPrivate::addCustom()
     during the execution of the program. Use setCustomColor() to set
     the custom colors, and use customColor() to get them.
 
-    \img qcolordlg-w.png
+    \img tqcolordlg-w.png
 */
 
 /*!
@@ -1668,6 +1668,6 @@ bool TQColorDialog::selectColor( const TQColor& col )
     return FALSE;
 }
 
-#include "qcolordialog.moc"
+#include "tqcolordialog.moc"
 
 #endif
diff --git a/src/dialogs/ntqcolordialog.h b/src/dialogs/tqcolordialog.h
index 0941a020d..0941a020d 100644
--- a/src/dialogs/ntqcolordialog.h
+++ b/src/dialogs/tqcolordialog.h
diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp
index 711ce2a73..194d7478a 100644
--- a/src/dialogs/tqfiledialog.cpp
+++ b/src/dialogs/tqfiledialog.cpp
@@ -79,7 +79,7 @@
 #include "tqmime.h"
 #include "tqnetworkprotocol.h"
 #include "tqobjectlist.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "tqpopupmenu.h"
 #include "ntqprogressbar.h"
 #include "tqptrvector.h"
diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/tqfontdialog.cpp
index dfb9731e1..8e7999a2b 100644
--- a/src/dialogs/qfontdialog.cpp
+++ b/src/dialogs/tqfontdialog.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_FONTDIALOG
 
-#include "ntqfontdialog.h"
+#include "tqfontdialog.h"
 
 #include "ntqlineedit.h"
 #include "ntqlistbox.h"
@@ -54,9 +54,9 @@
 #include "ntqhgroupbox.h"
 #include "ntqlabel.h"
 #include "ntqapplication.h"
-#include "ntqfontdatabase.h"
+#include "tqfontdatabase.h"
 #include "tqstyle.h"
-#include <private/qfontdata_p.h>
+#include <private/tqfontdata_p.h>
 #include <ntqvalidator.h>
 
 #ifdef TQ_WS_X11
@@ -64,7 +64,7 @@
 #endif
 
 /*!
-  \class TQFontDialog ntqfontdialog.h
+  \class TQFontDialog tqfontdialog.h
   \ingroup dialogs
   \mainclass
   \brief The TQFontDialog class provides a dialog widget for selecting a font.
@@ -95,7 +95,7 @@
 
   \sa TQFont TQFontInfo TQFontMetrics
 
-  <img src=qfontdlg-w.png>
+  <img src=tqfontdlg-w.png>
 */
 
 class TQFontDialogPrivate
@@ -470,7 +470,7 @@ bool TQFontDialog::eventFilter( TQObject * o , TQEvent * e )
 #endif
 
 #ifdef SHOW_FONTS_IN_FAMILIES
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include <sizeedit.h>
 
 class TQListBoxFontText : public TQListBoxText
diff --git a/src/dialogs/ntqfontdialog.h b/src/dialogs/tqfontdialog.h
index 743738170..2c7d3f9d4 100644
--- a/src/dialogs/ntqfontdialog.h
+++ b/src/dialogs/tqfontdialog.h
@@ -57,7 +57,7 @@
 
 #ifndef QT_H
 #include "ntqdialog.h"
-#include "ntqfont.h"
+#include "tqfont.h"
 #endif // QT_H
 
 class TQFontDialogPrivate;