12 files changed, 18 insertions, 18 deletions
diff --git a/src/dialogs/tqcolordialog.cpp b/src/dialogs/tqcolordialog.cpp
index feaefb010..43e77866f 100644
--- a/src/dialogs/tqcolordialog.cpp
+++ b/src/dialogs/tqcolordialog.cpp
@@ -53,7 +53,7 @@
 #include "tqvalidator.h"
 #include "tqdragobject.h"
 #include "tqgridview.h"
-#include "ntqapplication.h"
+#include "tqapplication.h"
 #include "tqstyle.h"
 #include "tqsettings.h"
 #include "tqpopupmenu.h"
diff --git a/src/dialogs/tqdialog.cpp b/src/dialogs/tqdialog.cpp
index 919a1ed38..277a1b4ca 100644
--- a/src/dialogs/tqdialog.cpp
+++ b/src/dialogs/tqdialog.cpp
@@ -44,7 +44,7 @@
 
 #include "tqpushbutton.h"
 #include "tqfocusdata.h"
-#include "ntqapplication.h"
+#include "tqapplication.h"
 #include "tqobjectlist.h"
 #include "tqwidgetlist.h"
 #include "tqlayout.h"
@@ -675,7 +675,7 @@ bool TQDialog::event( TQEvent *e )
 extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
 #include <private/tqt_x11_p.h>
 #undef FocusIn
-// defined in qapplication_x11.cpp
+// defined in tqapplication_x11.cpp
 extern Atom qt_net_wm_full_placement;
 extern bool qt_net_supports(Atom atom);
 #endif // TQ_WS_X11
diff --git a/src/dialogs/tqerrormessage.cpp b/src/dialogs/tqerrormessage.cpp
index f99db2c7a..12013b0f6 100644
--- a/src/dialogs/tqerrormessage.cpp
+++ b/src/dialogs/tqerrormessage.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_ERRORMESSAGE
 
-#include "ntqapplication.h"
+#include "tqapplication.h"
 #include "tqcheckbox.h"
 #include "tqdict.h"
 #include "tqlabel.h"
diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp
index 23a6d7f12..de4754ec4 100644
--- a/src/dialogs/tqfiledialog.cpp
+++ b/src/dialogs/tqfiledialog.cpp
@@ -54,8 +54,8 @@
 
 #ifndef TQT_NO_FILEDIALOG
 
-#include "private/qapplication_p.h"
-#include "ntqapplication.h"
+#include "private/tqapplication_p.h"
+#include "tqapplication.h"
 #include "tqbitmap.h"
 #include "tqbuttongroup.h"
 #include "tqcheckbox.h"
@@ -3405,7 +3405,7 @@ void TQFileDialog::rereadDir()
   \sa selectedFilter()
 */
 
-extern bool tqt_resolve_symlinks; // defined in qapplication.cpp
+extern bool tqt_resolve_symlinks; // defined in tqapplication.cpp
 bool TQ_EXPORT tqt_use_native_dialogs = TRUE;
 
 /*!
diff --git a/src/dialogs/tqfontdialog.cpp b/src/dialogs/tqfontdialog.cpp
index 0fb122cee..40c9f3de5 100644
--- a/src/dialogs/tqfontdialog.cpp
+++ b/src/dialogs/tqfontdialog.cpp
@@ -53,7 +53,7 @@
 #include "tqvgroupbox.h"
 #include "tqhgroupbox.h"
 #include "tqlabel.h"
-#include "ntqapplication.h"
+#include "tqapplication.h"
 #include "tqfontdatabase.h"
 #include "tqstyle.h"
 #include <private/tqfontdata_p.h>
diff --git a/src/dialogs/tqinputdialog.cpp b/src/dialogs/tqinputdialog.cpp
index b23bbaeaf..a58d9a2dc 100644
--- a/src/dialogs/tqinputdialog.cpp
+++ b/src/dialogs/tqinputdialog.cpp
@@ -50,7 +50,7 @@
 #include "tqcombobox.h"
 #include "tqwidgetstack.h"
 #include "tqvalidator.h"
-#include "ntqapplication.h"
+#include "tqapplication.h"
 
 class TQInputDialogPrivate
 {
diff --git a/src/dialogs/tqmessagebox.cpp b/src/dialogs/tqmessagebox.cpp
index 2a7178260..b90840cf7 100644
--- a/src/dialogs/tqmessagebox.cpp
+++ b/src/dialogs/tqmessagebox.cpp
@@ -46,7 +46,7 @@
 #include "tqlabel.h"
 #include "tqpushbutton.h"
 #include "tqimage.h"
-#include "ntqapplication.h"
+#include "tqapplication.h"
 #include "tqstyle.h"
 #include "tqobjectlist.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
diff --git a/src/dialogs/tqmessagebox.h b/src/dialogs/tqmessagebox.h
index a8b563830..cb0933f81 100644
--- a/src/dialogs/tqmessagebox.h
+++ b/src/dialogs/tqmessagebox.h
@@ -200,7 +200,7 @@ private:	// Disabled copy constructor and operator=
 /*
 *  Macro to be used at the beginning of main(), e.g.
 *
-*   #include <ntqapplication.h>
+*   #include <tqapplication.h>
 *   #include <tqmessagebox.h>
 *   int main( int argc, char**argv )
 *   {
diff --git a/src/dialogs/tqprintdialog.cpp b/src/dialogs/tqprintdialog.cpp
index a82ae4ee4..8430f2cbc 100644
--- a/src/dialogs/tqprintdialog.cpp
+++ b/src/dialogs/tqprintdialog.cpp
@@ -56,7 +56,7 @@
 #include "tqbuttongroup.h"
 #include "tqradiobutton.h"
 #include "tqspinbox.h"
-#include "ntqapplication.h"
+#include "tqapplication.h"
 #include "tqheader.h"
 #include "tqstyle.h"
 #include "tqstring.h"
@@ -724,11 +724,11 @@ static void parseSpoolInterface( TQListView * printers )
 // Every unix must have its own.  It's a standard.  Here is AIX.
 static void parseQconfig( TQListView * printers )
 {
-    TQFile qconfig( TQString::fromLatin1("/etc/qconfig") );
-    if ( !qconfig.open( IO_ReadOnly ) )
+    TQFile tqconfig( TQString::fromLatin1("/etc/tqconfig") );
+    if ( !tqconfig.open( IO_ReadOnly ) )
 	return;
 
-    TQTextStream ts( &qconfig );
+    TQTextStream ts( &tqconfig );
     TQString line;
 
     TQString stanzaName; // either a queue or a device name
diff --git a/src/dialogs/tqprogressdialog.cpp b/src/dialogs/tqprogressdialog.cpp
index 27d2f78bf..262dbd85b 100644
--- a/src/dialogs/tqprogressdialog.cpp
+++ b/src/dialogs/tqprogressdialog.cpp
@@ -46,7 +46,7 @@
 #include "tqpainter.h"
 #include "tqdrawutil.h"
 #include "tqdatetime.h"
-#include "ntqapplication.h"
+#include "tqapplication.h"
 #include "tqstyle.h"
 #include "tqpushbutton.h"
 #include "tqcursor.h"
diff --git a/src/dialogs/tqtabdialog.cpp b/src/dialogs/tqtabdialog.cpp
index f3ae9a744..b312ccc64 100644
--- a/src/dialogs/tqtabdialog.cpp
+++ b/src/dialogs/tqtabdialog.cpp
@@ -48,7 +48,7 @@
 #include "tqpushbutton.h"
 #include "tqpainter.h"
 #include "tqpixmap.h"
-#include "ntqapplication.h"
+#include "tqapplication.h"
 #include "tqtabwidget.h"
 #include "tqwidgetstack.h"
 #include "tqlayout.h"
diff --git a/src/dialogs/tqwizard.cpp b/src/dialogs/tqwizard.cpp
index 233857250..78b7431b2 100644
--- a/src/dialogs/tqwizard.cpp
+++ b/src/dialogs/tqwizard.cpp
@@ -47,7 +47,7 @@
 #include "tqcursor.h"
 #include "tqlabel.h"
 #include "tqwidgetstack.h"
-#include "ntqapplication.h"
+#include "tqapplication.h"
 #include "tqptrlist.h"
 #include "tqpainter.h"
 #include "tqaccel.h"