Rename ntqapplication, ntqconfig and ntqmodules files to equivalent tq*

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

77 files changed, 77 insertions, 78 deletions

diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp
index f744e34ff..e48142677 100644
--- a/tools/designer/designer/actiondnd.cpp
+++ b/tools/designer/designer/actiondnd.cpp
@@ -41,7 +41,7 @@
 #include "hierarchyview.h"
 
 #include <tqaction.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqbitmap.h>
 #include <tqdragobject.h>
 #include <tqinputdialog.h>
diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp
index 21fdbc3f3..e04bfd71d 100644
--- a/tools/designer/designer/command.cpp
+++ b/tools/designer/designer/command.cpp
@@ -49,7 +49,7 @@
 #include <tqfeatures.h>
 #include <tqwidget.h>
 #include <tqmetaobject.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqlayout.h>
 #include <tqmessagebox.h>
 #include <tqlistbox.h>
diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp
index 5eb81d29c..193477cf8 100644
--- a/tools/designer/designer/customwidgeteditorimpl.cpp
+++ b/tools/designer/designer/customwidgeteditorimpl.cpp
@@ -50,7 +50,7 @@
 #include <tqfiledialog.h>
 #include <tqmessagebox.h>
 #include <tqtimer.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqlistview.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/tools/designer/designer/dbconnectionsimpl.cpp b/tools/designer/designer/dbconnectionsimpl.cpp
index 37c4b8a43..413214782 100644
--- a/tools/designer/designer/dbconnectionsimpl.cpp
+++ b/tools/designer/designer/dbconnectionsimpl.cpp
@@ -43,7 +43,7 @@
 #include <tqpushbutton.h>
 #include <tqsqldatabase.h>
 #include <tqmessagebox.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "mainwindow.h"
 #include "asciivalidator.h"
 
diff --git a/tools/designer/designer/designer_de.ts b/tools/designer/designer/designer_de.ts
index f92fe096d..a3d66c67c 100644
--- a/tools/designer/designer/designer_de.ts
+++ b/tools/designer/designer/designer_de.ts
@@ -4444,7 +4444,7 @@ load these files?</source>
     </message>
 </context>
 <context>
-    <name>QApplication</name>
+    <name>TQApplication</name>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
diff --git a/tools/designer/designer/designer_fr.ts b/tools/designer/designer/designer_fr.ts
index a185365c4..710efadc6 100644
--- a/tools/designer/designer/designer_fr.ts
+++ b/tools/designer/designer/designer_fr.ts
@@ -4442,7 +4442,7 @@ load these files?</source>
     </message>
 </context>
 <context>
-    <name>QApplication</name>
+    <name>TQApplication</name>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h
index fd4fbe756..fa840181a 100644
--- a/tools/designer/designer/designer_pch.h
+++ b/tools/designer/designer/designer_pch.h
@@ -10,7 +10,7 @@
 
 #include <private/tqucomextra_p.h>
 #include <tqaction.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqdialog.h>
diff --git a/tools/designer/designer/designerapp.h b/tools/designer/designer/designerapp.h
index 296572e5b..df5271a68 100644
--- a/tools/designer/designer/designerapp.h
+++ b/tools/designer/designer/designerapp.h
@@ -36,7 +36,7 @@
 
 class TQSplashScreen;
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 class DesignerApplication : public TQApplication
 {
diff --git a/tools/designer/designer/formfile.cpp b/tools/designer/designer/formfile.cpp
index 2870f57c5..42e555c79 100644
--- a/tools/designer/designer/formfile.cpp
+++ b/tools/designer/designer/formfile.cpp
@@ -48,7 +48,7 @@
 #include <tqworkspace.h>
 #include <stdlib.h>
 #include "designerappiface.h"
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 static TQString make_func_pretty( const TQString &s )
 {
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index 8b7514f7f..d81852623 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -57,11 +57,10 @@
 #include <tqlabel.h>
 #include <tqobjectlist.h>
 #include <tqtimer.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqlayout.h>
 #include <tqspinbox.h>
 #include <tqstatusbar.h>
-#include <ntqapplication.h>
 #include <tqpalette.h>
 #include <tqmessagebox.h>
 #include <tqpopupmenu.h>
diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp
index a80a44cf7..a83867f21 100644
--- a/tools/designer/designer/hierarchyview.cpp
+++ b/tools/designer/designer/hierarchyview.cpp
@@ -58,7 +58,7 @@
 #include <tqwidgetstack.h>
 #include <tqtabbar.h>
 #include <tqfeatures.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqtimer.h>
 #include "../interfaces/languageinterface.h"
 #include <tqworkspace.h>
diff --git a/tools/designer/designer/listeditor.ui.h b/tools/designer/designer/listeditor.ui.h
index e28e90551..217ca58eb 100644
--- a/tools/designer/designer/listeditor.ui.h
+++ b/tools/designer/designer/listeditor.ui.h
@@ -7,7 +7,7 @@
 *****************************************************************************/
 
 #include <tqheader.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 void ListEditor::init()
 {
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index cf392f9af..c24984c33 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -40,7 +40,7 @@
 #include <tqmenubar.h>
 #include <tqlineedit.h>
 #include <tqtooltip.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqsignalmapper.h>
 #include <tqstylefactory.h>
 #include <tqworkspace.h>
diff --git a/tools/designer/designer/menubareditor.cpp b/tools/designer/designer/menubareditor.cpp
index cc3e22c25..613b9e5ee 100644
--- a/tools/designer/designer/menubareditor.cpp
+++ b/tools/designer/designer/menubareditor.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include <tqaction.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqbitmap.h>
 #include <tqdragobject.h>
 #include <tqlineedit.h>
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index b8385d056..094639a3d 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -41,7 +41,7 @@
 #include "project.h"
 #include "mainwindow.h"
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqobject.h>
 #include <tqlayout.h>
 #include <tqptrdict.h>
diff --git a/tools/designer/designer/multilineeditorimpl.cpp b/tools/designer/designer/multilineeditorimpl.cpp
index cea8ad720..9bbb09c6f 100644
--- a/tools/designer/designer/multilineeditorimpl.cpp
+++ b/tools/designer/designer/multilineeditorimpl.cpp
@@ -44,7 +44,7 @@
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqaction.h>
 #include <tqmetaobject.h>
 
diff --git a/tools/designer/designer/orderindicator.cpp b/tools/designer/designer/orderindicator.cpp
index e0a9a7ec5..baf16369b 100644
--- a/tools/designer/designer/orderindicator.cpp
+++ b/tools/designer/designer/orderindicator.cpp
@@ -38,7 +38,7 @@
 
 #include <tqpainter.h>
 #include <tqbitmap.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 OrderIndicator::OrderIndicator( int i, TQWidget* w, FormWindow *fw )
     : TQWidget( fw, "order_indicator", WMouseNoMask ), formWindow( fw )
diff --git a/tools/designer/designer/outputwindow.cpp b/tools/designer/designer/outputwindow.cpp
index 54d71b745..c0e319da4 100644
--- a/tools/designer/designer/outputwindow.cpp
+++ b/tools/designer/designer/outputwindow.cpp
@@ -38,7 +38,7 @@
 
 #include <tqlistview.h>
 #include <tqtextedit.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqheader.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tools/designer/designer/paletteeditoradvancedimpl.cpp b/tools/designer/designer/paletteeditoradvancedimpl.cpp
index df27dc318..10c9edf04 100644
--- a/tools/designer/designer/paletteeditoradvancedimpl.cpp
+++ b/tools/designer/designer/paletteeditoradvancedimpl.cpp
@@ -38,7 +38,7 @@
 
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
 #include <tqpainter.h>
diff --git a/tools/designer/designer/paletteeditorimpl.cpp b/tools/designer/designer/paletteeditorimpl.cpp
index 0aae0754b..02910e442 100644
--- a/tools/designer/designer/paletteeditorimpl.cpp
+++ b/tools/designer/designer/paletteeditorimpl.cpp
@@ -40,7 +40,7 @@
 
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqpushbutton.h>
 
 PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f )
diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp
index 0746fb015..980bb9921 100644
--- a/tools/designer/designer/pixmapchooser.cpp
+++ b/tools/designer/designer/pixmapchooser.cpp
@@ -44,7 +44,7 @@
 #include "pixmapcollection.h"
 #include "project.h"
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqimage.h>
 #include <tqpainter.h>
 #include <tqlabel.h>
diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp
index 2aa2c7062..d3891735a 100644
--- a/tools/designer/designer/popupmenueditor.cpp
+++ b/tools/designer/designer/popupmenueditor.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
 #include <tqdragobject.h>
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index 5f20067d9..777c54597 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -51,7 +51,7 @@
 #include <tqtextcodec.h>
 #include <tqdom.h>
 #include <tqmessagebox.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "mainwindow.h"
 #include <tqworkspace.h>
 
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 0883e63fc..03b9219c6 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -53,7 +53,7 @@
 
 #include <tqpainter.h>
 #include <tqpalette.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqheader.h>
 #include <tqlineedit.h>
 #include <tqstrlist.h>
diff --git a/tools/designer/designer/propertyeditor.h b/tools/designer/designer/propertyeditor.h
index ac9fcb326..0c8b3c22d 100644
--- a/tools/designer/designer/propertyeditor.h
+++ b/tools/designer/designer/propertyeditor.h
@@ -40,7 +40,7 @@
 #include <tqptrlist.h>
 #include <tqguardedptr.h>
 #include <tqtabwidget.h>
-#include <ntqmodules.h>
+#include <tqmodules.h>
 #include <tqptrlist.h>
 #include <tqlayout.h>
 #include <tqcheckbox.h>
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index e65493c5a..ee602c271 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -51,7 +51,7 @@
 #include <widgetdatabase.h>
 
 #include <tqaccel.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqbuffer.h>
 #include <tqcombobox.h>
 #include <tqdatetime.h>
diff --git a/tools/designer/designer/sizehandle.cpp b/tools/designer/designer/sizehandle.cpp
index a7e213669..aa442085f 100644
--- a/tools/designer/designer/sizehandle.cpp
+++ b/tools/designer/designer/sizehandle.cpp
@@ -38,7 +38,7 @@
 #include "widgetfactory.h"
 
 #include <tqwidget.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqlabel.h>
 
 SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s )
diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp
index 9fe20026a..59125b685 100644
--- a/tools/designer/designer/startdialogimpl.cpp
+++ b/tools/designer/designer/startdialogimpl.cpp
@@ -13,7 +13,7 @@
 #include <tqfileinfo.h>
 #include <tqmap.h>
 #include <tqdatetime.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqcheckbox.h>
 #include <tqurl.h>
 
diff --git a/tools/designer/designer/styledbutton.cpp b/tools/designer/designer/styledbutton.cpp
index 6f57519d9..e4dfd5f93 100644
--- a/tools/designer/designer/styledbutton.cpp
+++ b/tools/designer/designer/styledbutton.cpp
@@ -41,7 +41,7 @@
 #include <tqpainter.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqdragobject.h>
 #include <tqstyle.h>
 
diff --git a/tools/designer/designer/syntaxhighlighter_html.cpp b/tools/designer/designer/syntaxhighlighter_html.cpp
index 6a7946c05..164f30a66 100644
--- a/tools/designer/designer/syntaxhighlighter_html.cpp
+++ b/tools/designer/designer/syntaxhighlighter_html.cpp
@@ -35,7 +35,7 @@
 #include "syntaxhighlighter_html.h"
 #include "tqstring.h"
 #include "tqmap.h"
-#include "ntqapplication.h"
+#include "tqapplication.h"
 
 
 SyntaxHighlighter_HTML::SyntaxHighlighter_HTML()
diff --git a/tools/designer/designer/tqcompletionedit.cpp b/tools/designer/designer/tqcompletionedit.cpp
index 02c3af5c5..466cedcee 100644
--- a/tools/designer/designer/tqcompletionedit.cpp
+++ b/tools/designer/designer/tqcompletionedit.cpp
@@ -34,7 +34,7 @@
 #include "tqcompletionedit.h"
 #include <tqlistbox.h>
 #include <tqsizegrip.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqvbox.h>
 
 TQCompletionEdit::TQCompletionEdit( TQWidget *parent, const char *name )
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index b2fb21d0b..4611047ce 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -91,7 +91,7 @@
 #include <tqscrollbar.h>
 #include <tqmainwindow.h>
 #include <tqmenubar.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqsplitter.h>
 #include <tqtoolbox.h>
 #include <tqsizegrip.h>
diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp
index 485f02ea4..560b81464 100644
--- a/tools/designer/designer/workspace.cpp
+++ b/tools/designer/designer/workspace.cpp
@@ -46,7 +46,7 @@
 #include <tqheader.h>
 #include <tqdragobject.h>
 #include <tqfileinfo.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqpainter.h>
 #include <tqpen.h>
 #include <tqobjectlist.h>
diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp
index b8e71233b..22acdc951 100644
--- a/tools/designer/editor/completion.cpp
+++ b/tools/designer/editor/completion.cpp
@@ -38,7 +38,7 @@
 #include <tqvbox.h>
 #include <tqmap.h>
 #include <private/tqrichtext_p.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqregexp.h>
 #include "arghintwidget.h"
 #include <tqsizegrip.h>
diff --git a/tools/designer/editor/conf.cpp b/tools/designer/editor/conf.cpp
index 65541ea12..dba758a2f 100644
--- a/tools/designer/editor/conf.cpp
+++ b/tools/designer/editor/conf.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "conf.h"
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqfont.h>
 #include <tqcolor.h>
 #include <tqsettings.h>
diff --git a/tools/designer/editor/editor.cpp b/tools/designer/editor/editor.cpp
index 86af88362..127bcbeef 100644
--- a/tools/designer/editor/editor.cpp
+++ b/tools/designer/editor/editor.cpp
@@ -36,7 +36,7 @@
 #include <tqfile.h>
 #include <private/tqrichtext_p.h>
 #include "conf.h"
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqpopupmenu.h>
 #include <tqaccel.h>
 
diff --git a/tools/designer/editor/parenmatcher.cpp b/tools/designer/editor/parenmatcher.cpp
index 5976fc0ff..a753f34a2 100644
--- a/tools/designer/editor/parenmatcher.cpp
+++ b/tools/designer/editor/parenmatcher.cpp
@@ -36,7 +36,7 @@
 
 #include "tqtextedit.h"
 #include <private/tqrichtext_p.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 ParenMatcher::ParenMatcher()
 {
diff --git a/tools/designer/examples/addressbook/addressbook.ui.h b/tools/designer/examples/addressbook/addressbook.ui.h
index 35cf1e737..7e97cc96a 100644
--- a/tools/designer/examples/addressbook/addressbook.ui.h
+++ b/tools/designer/examples/addressbook/addressbook.ui.h
@@ -11,7 +11,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqfiledialog.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 void AddressBook::fileNew()
 {
diff --git a/tools/designer/examples/addressbook/main.cpp b/tools/designer/examples/addressbook/main.cpp
index 0359e37c0..09a8fe001 100644
--- a/tools/designer/examples/addressbook/main.cpp
+++ b/tools/designer/examples/addressbook/main.cpp
@@ -1,4 +1,4 @@
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "addressbook.h"
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/examples/book/book1/main.cpp b/tools/designer/examples/book/book1/main.cpp
index e101e2711..21c9fcacc 100644
--- a/tools/designer/examples/book/book1/main.cpp
+++ b/tools/designer/examples/book/book1/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
diff --git a/tools/designer/examples/book/book2/main.cpp b/tools/designer/examples/book/book2/main.cpp
index e101e2711..21c9fcacc 100644
--- a/tools/designer/examples/book/book2/main.cpp
+++ b/tools/designer/examples/book/book2/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
diff --git a/tools/designer/examples/book/book3/main.cpp b/tools/designer/examples/book/book3/main.cpp
index db0977fb1..e1f5ebfe5 100644
--- a/tools/designer/examples/book/book3/main.cpp
+++ b/tools/designer/examples/book/book3/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
diff --git a/tools/designer/examples/book/book4/main.cpp b/tools/designer/examples/book/book4/main.cpp
index 234e8e7f0..6072fbd1c 100644
--- a/tools/designer/examples/book/book4/main.cpp
+++ b/tools/designer/examples/book/book4/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
diff --git a/tools/designer/examples/book/book5/main.cpp b/tools/designer/examples/book/book5/main.cpp
index e101e2711..21c9fcacc 100644
--- a/tools/designer/examples/book/book5/main.cpp
+++ b/tools/designer/examples/book/book5/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
diff --git a/tools/designer/examples/book/book6/main.cpp b/tools/designer/examples/book/book6/main.cpp
index e101e2711..21c9fcacc 100644
--- a/tools/designer/examples/book/book6/main.cpp
+++ b/tools/designer/examples/book/book6/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
diff --git a/tools/designer/examples/book/book7/main.cpp b/tools/designer/examples/book/book7/main.cpp
index e101e2711..21c9fcacc 100644
--- a/tools/designer/examples/book/book7/main.cpp
+++ b/tools/designer/examples/book/book7/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
diff --git a/tools/designer/examples/book/book8/main.cpp b/tools/designer/examples/book/book8/main.cpp
index e101e2711..21c9fcacc 100644
--- a/tools/designer/examples/book/book8/main.cpp
+++ b/tools/designer/examples/book/book8/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
diff --git a/tools/designer/examples/colortool/main.cpp b/tools/designer/examples/colortool/main.cpp
index 7b3be5a5c..8375c5918 100644
--- a/tools/designer/examples/colortool/main.cpp
+++ b/tools/designer/examples/colortool/main.cpp
@@ -1,4 +1,4 @@
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "mainform.h"
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/examples/colortool/mainform.ui b/tools/designer/examples/colortool/mainform.ui
index 43c77db51..ce0b50729 100644
--- a/tools/designer/examples/colortool/mainform.ui
+++ b/tools/designer/examples/colortool/mainform.ui
@@ -520,7 +520,7 @@
     <include location="local" impldecl="in implementation">tqregexp.h</include>
     <include location="local" impldecl="in implementation">tqfile.h</include>
     <include location="local" impldecl="in implementation">tqfiledialog.h</include>
-    <include location="local" impldecl="in implementation">ntqapplication.h</include>
+    <include location="local" impldecl="in implementation">tqapplication.h</include>
     <include location="local" impldecl="in implementation">tqcolor.h</include>
     <include location="local" impldecl="in implementation">tqstring.h</include>
     <include location="local" impldecl="in implementation">tqpainter.h</include>
diff --git a/tools/designer/examples/credit/main.cpp b/tools/designer/examples/credit/main.cpp
index a1e06b3ca..43a32ea75 100644
--- a/tools/designer/examples/credit/main.cpp
+++ b/tools/designer/examples/credit/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "creditform.h"
 
 
diff --git a/tools/designer/examples/filechooser/widget/main.cpp b/tools/designer/examples/filechooser/widget/main.cpp
index b50ddf7f0..6daadddfc 100644
--- a/tools/designer/examples/filechooser/widget/main.cpp
+++ b/tools/designer/examples/filechooser/widget/main.cpp
@@ -1,4 +1,4 @@
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "filechooser.h"
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/examples/metric/main.cpp b/tools/designer/examples/metric/main.cpp
index 00ec8c418..1d555d1f8 100644
--- a/tools/designer/examples/metric/main.cpp
+++ b/tools/designer/examples/metric/main.cpp
@@ -1,4 +1,4 @@
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "metric.h"
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/examples/multiclip/main.cpp b/tools/designer/examples/multiclip/main.cpp
index 4b1e93aae..a48753743 100644
--- a/tools/designer/examples/multiclip/main.cpp
+++ b/tools/designer/examples/multiclip/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "multiclip.h"
 
 
diff --git a/tools/designer/examples/multiclip/multiclip.ui b/tools/designer/examples/multiclip/multiclip.ui
index 35c2b4e20..d20b07534 100644
--- a/tools/designer/examples/multiclip/multiclip.ui
+++ b/tools/designer/examples/multiclip/multiclip.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>MulticlipForm</class>
 <include location="global" impldecl="in declaration">tqclipboard.h</include>
-<include location="global" impldecl="in implementation">ntqapplication.h</include>
+<include location="global" impldecl="in implementation">tqapplication.h</include>
 <include location="local" implDecl="in declaration">multiclip.ui.h</include>
 <variable>TQClipboard *cb;</variable>
 <pixmapinproject/>
diff --git a/tools/designer/examples/receiver1/main.cpp b/tools/designer/examples/receiver1/main.cpp
index 72efaafa0..e8aeb0aec 100644
--- a/tools/designer/examples/receiver1/main.cpp
+++ b/tools/designer/examples/receiver1/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "mainform.h"
 
 int main( int argc, char *argv[] ) 
diff --git a/tools/designer/examples/receiver2/main.cpp b/tools/designer/examples/receiver2/main.cpp
index 697f7a5f3..5fb03be8e 100644
--- a/tools/designer/examples/receiver2/main.cpp
+++ b/tools/designer/examples/receiver2/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "mainform.h"
 
 
diff --git a/tools/designer/examples/richedit/main.cpp b/tools/designer/examples/richedit/main.cpp
index 1a5cb1f83..55f8ed553 100644
--- a/tools/designer/examples/richedit/main.cpp
+++ b/tools/designer/examples/richedit/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "richedit.h"
 
 
diff --git a/tools/designer/examples/richedit/richedit.ui b/tools/designer/examples/richedit/richedit.ui
index 88e829a90..7601adb89 100644
--- a/tools/designer/examples/richedit/richedit.ui
+++ b/tools/designer/examples/richedit/richedit.ui
@@ -3,7 +3,7 @@
 <include location="global" impldecl="in implementation">tqfile.h</include>
 <include location="global" impldecl="in implementation">tqfontdatabase.h</include>
 <include location="global" impldecl="in implementation">tqmessagebox.h</include>
-<include location="global" impldecl="in implementation">ntqapplication.h</include>
+<include location="global" impldecl="in implementation">tqapplication.h</include>
 <include location="global" impldecl="in implementation">tqfiledialog.h</include>
 <include location="global" impldecl="in implementation">tqtextstream.h</include>
 <include location="local" implDecl="in declaration">richedit.ui.h</include>
diff --git a/tools/designer/examples/sizeaware/main.cpp b/tools/designer/examples/sizeaware/main.cpp
index 2b0dcf446..11d4e1579 100644
--- a/tools/designer/examples/sizeaware/main.cpp
+++ b/tools/designer/examples/sizeaware/main.cpp
@@ -1,4 +1,4 @@
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "sizeaware.h"
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/examples/vcr/main.cpp b/tools/designer/examples/vcr/main.cpp
index 4beb0d1cb..71f04f856 100644
--- a/tools/designer/examples/vcr/main.cpp
+++ b/tools/designer/examples/vcr/main.cpp
@@ -1,4 +1,4 @@
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "vcr.h"
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp
index a7b60eae1..84ec3dd8d 100644
--- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp
+++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp
@@ -36,7 +36,7 @@
 #include <viewmanager.h>
 #include "cppeditor.h"
 #include <private/tqrichtext_p.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "completion.h"
 #include <designerinterface.h>
 #include <tqtimer.h>
diff --git a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
index 879e39d1b..3d414d587 100644
--- a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
+++ b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
@@ -68,7 +68,7 @@ TQStringList SourceTemplateInterfaceImpl::featureList() const
 static TQString generateMainCppCode( const TQString &formname, const TQString &include )
 {
     TQString code;
-    code += "#include <ntqapplication.h>\n";
+    code += "#include <tqapplication.h>\n";
     code += "#include \"" + include + "\"\n";
     code += "\n";
     code += "int main( int argc, char ** argv )\n";
diff --git a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
index 36a116768..2109cdb8b 100644
--- a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
+++ b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
@@ -37,7 +37,7 @@
 #include "tqstring.h"
 #include "tqstringlist.h"
 #include "tqmap.h"
-#include "ntqapplication.h"
+#include "tqapplication.h"
 #include "tqregexp.h"
 
 const char * const SyntaxHighlighter_CPP::keywords[] = {
diff --git a/tools/designer/plugins/dlg/main.cpp b/tools/designer/plugins/dlg/main.cpp
index 2aa9cef5a..96bb6d914 100644
--- a/tools/designer/plugins/dlg/main.cpp
+++ b/tools/designer/plugins/dlg/main.cpp
@@ -33,7 +33,7 @@
 **********************************************************************/
 
 #include <filterinterface.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 #include "dlg2ui.h"
 
diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp
index 3ede1321d..67531031c 100644
--- a/tools/designer/plugins/glade/glade2ui.cpp
+++ b/tools/designer/plugins/glade/glade2ui.cpp
@@ -36,7 +36,7 @@
 
 #include "glade2ui.h"
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqfile.h>
 #include <tqimage.h>
 #include <tqprogressdialog.h>
diff --git a/tools/designer/plugins/glade/main.cpp b/tools/designer/plugins/glade/main.cpp
index e0df6460f..879493c6c 100644
--- a/tools/designer/plugins/glade/main.cpp
+++ b/tools/designer/plugins/glade/main.cpp
@@ -33,7 +33,7 @@
 **********************************************************************/
 
 #include <filterinterface.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 #include "glade2ui.h"
 
diff --git a/tools/designer/plugins/kdevdlg/main.cpp b/tools/designer/plugins/kdevdlg/main.cpp
index af5c08c93..767c90b9b 100644
--- a/tools/designer/plugins/kdevdlg/main.cpp
+++ b/tools/designer/plugins/kdevdlg/main.cpp
@@ -34,7 +34,7 @@
 
 #include <filterinterface.h>
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqstring.h>
 #include <tqdir.h>
 
diff --git a/tools/designer/plugins/rc/main.cpp b/tools/designer/plugins/rc/main.cpp
index c43a17264..502c6729e 100644
--- a/tools/designer/plugins/rc/main.cpp
+++ b/tools/designer/plugins/rc/main.cpp
@@ -34,7 +34,7 @@
 
 #include <filterinterface.h>
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 #include "rc2ui.h"
 
diff --git a/tools/designer/plugins/wizards/main.cpp b/tools/designer/plugins/wizards/main.cpp
index b8cda6e1e..1a4bb7b53 100644
--- a/tools/designer/plugins/wizards/main.cpp
+++ b/tools/designer/plugins/wizards/main.cpp
@@ -39,7 +39,7 @@
 #include "sqlformwizardimpl.h"
 #endif
 #include "mainwindowwizard.h"
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 class StandardTemplateWizardInterface : public TemplateWizardInterface, public TQLibraryInterface
 {
diff --git a/tools/designer/shared/globaldefs.h b/tools/designer/shared/globaldefs.h
index a92e2a46a..d121256d1 100644
--- a/tools/designer/shared/globaldefs.h
+++ b/tools/designer/shared/globaldefs.h
@@ -35,7 +35,7 @@
 #define GLOBALDEFS_H
 
 #include <tqcolor.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 #define BOXLAYOUT_DEFAULT_MARGIN 11
 #define BOXLAYOUT_DEFAULT_SPACING 6
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index e74139ef5..b58e0b578 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -34,7 +34,7 @@
 #include "widgetdatabase.h"
 #include "../interfaces/widgetinterface.h"
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 #include <tqstrlist.h>
diff --git a/tools/designer/tools/tqtconv2ui/main.cpp b/tools/designer/tools/tqtconv2ui/main.cpp
index 4044e1e4a..82d5a18ab 100644
--- a/tools/designer/tools/tqtconv2ui/main.cpp
+++ b/tools/designer/tools/tqtconv2ui/main.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <private/tqpluginmanager_p.h>
 #include <tqstringlist.h>
 #include <tqdir.h>
diff --git a/tools/designer/tools/tqtcreatecw/main.cpp b/tools/designer/tools/tqtcreatecw/main.cpp
index 02633f37d..36dd3c9af 100644
--- a/tools/designer/tools/tqtcreatecw/main.cpp
+++ b/tools/designer/tools/tqtcreatecw/main.cpp
@@ -36,7 +36,7 @@
 #include <tqvaluelist.h>
 #include <tqstrlist.h>
 #include <tqmetaobject.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 
 // STEP1: Include header files of the widgets for which a description
 // should be created here. If you have a widget which is defined in
diff --git a/tools/designer/tquic/form.cpp b/tools/designer/tquic/form.cpp
index 09b3a6828..dd77d0113 100644
--- a/tools/designer/tquic/form.cpp
+++ b/tools/designer/tquic/form.cpp
@@ -804,7 +804,7 @@ void TQUic::createFormImpl( const TQDomElement &e )
 	    TQString name = getClassName( nl.item(i).toElement() );
 	    if ( name == "Spacer" ) {
 		globalIncludes += "tqlayout.h";
-		globalIncludes += "ntqapplication.h";
+		globalIncludes += "tqapplication.h";
 		continue;
 	    }
 	    if (( name.mid( 1 ) == "ListView" ) || ( name.mid( 2 ) == "ListView" ))
diff --git a/tools/designer/tquic/main.cpp b/tools/designer/tquic/main.cpp
index 636ffd432..f9432d050 100644
--- a/tools/designer/tquic/main.cpp
+++ b/tools/designer/tquic/main.cpp
@@ -36,7 +36,7 @@
 #if defined(UIB)
 #include "ui2uib.h"
 #endif
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqfile.h>
 #include <tqstringlist.h>
 #include <tqdatetime.h>
diff --git a/tools/designer/uilib/test/main.cpp b/tools/designer/uilib/test/main.cpp
index 4637cf604..1665f301c 100644
--- a/tools/designer/uilib/test/main.cpp
+++ b/tools/designer/uilib/test/main.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include "../tqwidgetfactory.h"
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/uilib/tqwidgetfactory.cpp b/tools/designer/uilib/tqwidgetfactory.cpp
index a608eeaf8..02ede9a4f 100644
--- a/tools/designer/uilib/tqwidgetfactory.cpp
+++ b/tools/designer/uilib/tqwidgetfactory.cpp
@@ -44,7 +44,7 @@
 #include <tqmetaobject.h>
 #include <domtool.h>
 #include <uib.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqobjectlist.h>