Rename IO and network class nt* related files to equivalent tq*

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

52 files changed, 89 insertions, 88 deletions

diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp
index 17ed552bc..beaf9e551 100644
--- a/tools/designer/app/main.cpp
+++ b/tools/designer/app/main.cpp
@@ -45,9 +45,9 @@
 
 #include <tqtextstream.h>
 #include <tqobjectlist.h>
-#include <ntqsettings.h>
+#include <tqsettings.h>
 #include <ntqsplashscreen.h>
-#include <ntqdir.h>
+#include <tqdir.h>
 
 #include <stdlib.h>
 #include <signal.h>
diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp
index bfc9d76cc..fa88543ed 100644
--- a/tools/designer/designer/customwidgeteditorimpl.cpp
+++ b/tools/designer/designer/customwidgeteditorimpl.cpp
@@ -47,12 +47,12 @@
 #include <ntqspinbox.h>
 #include <ntqlabel.h>
 #include <ntqmessagebox.h>
-#include <ntqfiledialog.h>
+#include <tqfiledialog.h>
 #include <ntqmessagebox.h>
 #include <tqtimer.h>
 #include <ntqapplication.h>
 #include <ntqlistview.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqdom.h>
 #include <tqtextcodec.h>
diff --git a/tools/designer/designer/designerapp.cpp b/tools/designer/designer/designerapp.cpp
index 370558d76..0275c1f81 100644
--- a/tools/designer/designer/designerapp.cpp
+++ b/tools/designer/designer/designerapp.cpp
@@ -36,9 +36,9 @@
 #include "mainwindow.h"
 #include "formwindow.h"
 
-#include <ntqfile.h>
-#include <ntqdir.h>
-#include <ntqsettings.h>
+#include <tqfile.h>
+#include <tqdir.h>
+#include <tqsettings.h>
 #include <ntqsplashscreen.h>
 
 #ifdef TQ_WS_WIN
diff --git a/tools/designer/designer/formfile.cpp b/tools/designer/designer/formfile.cpp
index feadfe7e7..c18335ef1 100644
--- a/tools/designer/designer/formfile.cpp
+++ b/tools/designer/designer/formfile.cpp
@@ -42,7 +42,7 @@
 #include "resource.h"
 #include "workspace.h"
 #include <ntqmessagebox.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqstatusbar.h>
 #include "propertyeditor.h"
 #include <tqworkspace.h>
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 69d59513d..6c52d2091 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -94,15 +94,15 @@
 #include <tqaction.h>
 #include <ntqpixmap.h>
 #include <tqworkspace.h>
-#include <ntqfiledialog.h>
-#include <ntqclipboard.h>
+#include <tqfiledialog.h>
+#include <tqclipboard.h>
 #include <ntqmessagebox.h>
-#include <ntqbuffer.h>
-#include <ntqdir.h>
+#include <tqbuffer.h>
+#include <tqdir.h>
 #include <tqstyle.h>
 #include <ntqlabel.h>
 #include <tqstatusbar.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <ntqcheckbox.h>
 #include <ntqwhatsthis.h>
 #include <ntqwizard.h>
@@ -111,8 +111,8 @@
 #include <ntqdockwindow.h>
 #include <tqstylefactory.h>
 #include <ntqvbox.h>
-#include <ntqprocess.h>
-#include <ntqsettings.h>
+#include <tqprocess.h>
+#include <tqsettings.h>
 #include <ntqaccel.h>
 #include <tqtooltip.h>
 #include <tqsizegrip.h>
@@ -826,7 +826,7 @@ void MainWindow::helpAboutTQt()
 
 #if defined(_WS_WIN_)
 #include <qt_windows.h>
-#include <ntqprocess.h>
+#include <tqprocess.h>
 #endif
 
 void MainWindow::helpRegister()
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index 00606810f..ec13ffca7 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -41,13 +41,13 @@
 #include <ntqlineedit.h>
 #include <tqtooltip.h>
 #include <ntqapplication.h>
-#include <ntqsignalmapper.h>
+#include <tqsignalmapper.h>
 #include <tqstylefactory.h>
 #include <tqworkspace.h>
 #include <ntqmessagebox.h>
 #include <tqstatusbar.h>
 #include <ntqlistbox.h>
-#include <ntqclipboard.h>
+#include <tqclipboard.h>
 #include <ntqcombobox.h>
 #include <ntqspinbox.h>
 #include <ntqinputdialog.h>
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index edab8df30..82b29a6e3 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -53,8 +53,8 @@
 #include <tqregexp.h>
 #include <private/qpluginmanager_p.h>
 #include <tqdatetime.h>
-#include <ntqfile.h>
-#include <ntqfileinfo.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
 #include <tqtextstream.h>
 
 #include <stdlib.h>
diff --git a/tools/designer/designer/newformimpl.cpp b/tools/designer/designer/newformimpl.cpp
index 837dabc83..f050bdab6 100644
--- a/tools/designer/designer/newformimpl.cpp
+++ b/tools/designer/designer/newformimpl.cpp
@@ -46,8 +46,8 @@
 
 #include <tqiconview.h>
 #include <ntqlabel.h>
-#include <ntqfileinfo.h>
-#include <ntqdir.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
 #include <ntqpushbutton.h>
 #include <stdlib.h>
 #include <ntqcombobox.h>
diff --git a/tools/designer/designer/pixmapchooser.h b/tools/designer/designer/pixmapchooser.h
index 220502162..0ffd74384 100644
--- a/tools/designer/designer/pixmapchooser.h
+++ b/tools/designer/designer/pixmapchooser.h
@@ -34,10 +34,10 @@
 #ifndef PIXMAPCHOOSER_H
 #define PIXMAPCHOOSER_H
 
-#include <ntqfiledialog.h>
+#include <tqfiledialog.h>
 #include <ntqscrollview.h>
 #include <ntqpixmap.h>
-#include <ntqurl.h>
+#include <tqurl.h>
 
 class FormWindow;
 
diff --git a/tools/designer/designer/pixmapcollection.cpp b/tools/designer/designer/pixmapcollection.cpp
index 2675c77aa..c896991c9 100644
--- a/tools/designer/designer/pixmapcollection.cpp
+++ b/tools/designer/designer/pixmapcollection.cpp
@@ -35,8 +35,8 @@
 #include "project.h"
 #include "mainwindow.h"
 #include <tqmime.h>
-#include <ntqdir.h>
-#include <ntqfileinfo.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
 #include <tqtextstream.h>
 #include <tqimage.h>
 
diff --git a/tools/designer/designer/pixmapcollectioneditor.ui b/tools/designer/designer/pixmapcollectioneditor.ui
index e6075c9e4..26a52eca4 100644
--- a/tools/designer/designer/pixmapcollectioneditor.ui
+++ b/tools/designer/designer/pixmapcollectioneditor.ui
@@ -197,7 +197,7 @@
     <include location="local" impldecl="in implementation">pixmapcollection.h</include>
     <include location="local" impldecl="in implementation">pixmapchooser.h</include>
     <include location="local" impldecl="in implementation">project.h</include>
-    <include location="global" impldecl="in implementation">ntqfileinfo.h</include>
+    <include location="global" impldecl="in implementation">tqfileinfo.h</include>
     <include location="global" impldecl="in implementation">tqimage.h</include>
     <include location="global" impldecl="in declaration">ntqpixmap.h</include>
     <include location="local" impldecl="in implementation">pixmapcollectioneditor.ui.h</include>
diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp
index e238a84e8..ad9957a3a 100644
--- a/tools/designer/designer/popupmenueditor.cpp
+++ b/tools/designer/designer/popupmenueditor.cpp
@@ -33,7 +33,7 @@
 
 #include <ntqapplication.h>
 #include <tqcstring.h>
-#include <ntqdatastream.h>
+#include <tqdatastream.h>
 #include <tqdragobject.h>
 #include <ntqlineedit.h>
 #include <tqobjectlist.h>
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index 2c6fa89d4..d56876f17 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -43,9 +43,9 @@
 #include <tqwidgetfactory.h>
 #include "outputwindow.h"
 
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqtextstream.h>
-#include <ntqurl.h>
+#include <tqurl.h>
 #include <tqobjectlist.h>
 #include <ntqfeatures.h>
 #include <tqtextcodec.h>
diff --git a/tools/designer/designer/projectsettingsimpl.cpp b/tools/designer/designer/projectsettingsimpl.cpp
index 0a4a724db..2699421ed 100644
--- a/tools/designer/designer/projectsettingsimpl.cpp
+++ b/tools/designer/designer/projectsettingsimpl.cpp
@@ -44,7 +44,7 @@
 #include <ntqlineedit.h>
 #include <tqtextedit.h>
 #include <ntqcheckbox.h>
-#include <ntqfiledialog.h>
+#include <tqfiledialog.h>
 #include <ntqcombobox.h>
 #include <tqobjectlist.h>
 #include <ntqheader.h>
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 5ad88ab31..50ffd404c 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -80,7 +80,7 @@
 #include <tqtimer.h>
 #include <tqdragobject.h>
 #include <tqdom.h>
-#include <ntqprocess.h>
+#include <tqprocess.h>
 #include <tqstyle.h>
 #include <tqdatetimeedit.h>
 #include <ntqassistantclient.h>
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index d6f35a06b..b1cd5d1bb 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -52,12 +52,12 @@
 
 #include <ntqaccel.h>
 #include <ntqapplication.h>
-#include <ntqbuffer.h>
+#include <tqbuffer.h>
 #include <ntqcombobox.h>
 #include <tqdatetime.h>
 #include <tqdom.h>
 #include <ntqfeatures.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <ntqheader.h>
 #include <tqiconview.h>
 #include <ntqlabel.h>
diff --git a/tools/designer/designer/sourcefile.cpp b/tools/designer/designer/sourcefile.cpp
index 200a06a84..b0d21b2a8 100644
--- a/tools/designer/designer/sourcefile.cpp
+++ b/tools/designer/designer/sourcefile.cpp
@@ -32,13 +32,13 @@
 **********************************************************************/
 
 #include "sourcefile.h"
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqtextstream.h>
 #include "designerappiface.h"
 #include "sourceeditor.h"
 #include "metadatabase.h"
 #include "../interfaces/languageinterface.h"
-#include <ntqfiledialog.h>
+#include <tqfiledialog.h>
 #include <ntqmessagebox.h>
 #include "mainwindow.h"
 #include "workspace.h"
diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp
index d38b760ea..fbe7884cd 100644
--- a/tools/designer/designer/startdialogimpl.cpp
+++ b/tools/designer/designer/startdialogimpl.cpp
@@ -4,18 +4,18 @@
 #include <tqiconview.h>
 #include <ntqcombobox.h>
 #include <ntqlabel.h>
-#include <ntqfiledialog.h>
+#include <tqfiledialog.h>
 #include <ntqtabwidget.h>
 #include <ntqpoint.h>
 #include <tqobjectlist.h>
 #include <ntqpushbutton.h>
 #include <ntqlayout.h>
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <tqmap.h>
 #include <tqdatetime.h>
 #include <ntqapplication.h>
 #include <ntqcheckbox.h>
-#include <ntqurl.h>
+#include <tqurl.h>
 
 #include "mainwindow.h"
 #include "startdialogimpl.h"
diff --git a/tools/designer/designer/startdialogimpl.h b/tools/designer/designer/startdialogimpl.h
index 2e86e0c6c..e1800ff76 100644
--- a/tools/designer/designer/startdialogimpl.h
+++ b/tools/designer/designer/startdialogimpl.h
@@ -38,7 +38,7 @@
 #include <ntqlistview.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <ntqfiledialog.h>
+#include <tqfiledialog.h>
 #include <tqmap.h>
 
 #include "newformimpl.h"
diff --git a/tools/designer/designer/timestamp.cpp b/tools/designer/designer/timestamp.cpp
index f9bb3f1b5..1d9d4c5de 100644
--- a/tools/designer/designer/timestamp.cpp
+++ b/tools/designer/designer/timestamp.cpp
@@ -32,8 +32,8 @@
 **********************************************************************/
 
 #include "timestamp.h"
-#include <ntqfile.h>
-#include <ntqfileinfo.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
 
 class TQTimer;
 
diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp
index d201d04e9..f0ba9f5dd 100644
--- a/tools/designer/designer/workspace.cpp
+++ b/tools/designer/designer/workspace.cpp
@@ -45,7 +45,7 @@
 
 #include <ntqheader.h>
 #include <tqdragobject.h>
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <ntqapplication.h>
 #include <ntqpainter.h>
 #include <ntqpen.h>
diff --git a/tools/designer/editor/conf.cpp b/tools/designer/editor/conf.cpp
index bff128679..b3b7e721a 100644
--- a/tools/designer/editor/conf.cpp
+++ b/tools/designer/editor/conf.cpp
@@ -35,7 +35,7 @@
 #include <ntqapplication.h>
 #include <ntqfont.h>
 #include <ntqcolor.h>
-#include <ntqsettings.h>
+#include <tqsettings.h>
 
 TQMap<TQString, ConfigStyle> Config::defaultStyles()
 {
diff --git a/tools/designer/editor/editor.cpp b/tools/designer/editor/editor.cpp
index 69af84ac2..b719ab4e5 100644
--- a/tools/designer/editor/editor.cpp
+++ b/tools/designer/editor/editor.cpp
@@ -33,7 +33,7 @@
 
 #include "editor.h"
 #include "parenmatcher.h"
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <private/qrichtext_p.h>
 #include "conf.h"
 #include <ntqapplication.h>
diff --git a/tools/designer/editor/preferences.ui b/tools/designer/editor/preferences.ui
index 3f1131c88..19bdea430 100644
--- a/tools/designer/editor/preferences.ui
+++ b/tools/designer/editor/preferences.ui
@@ -481,7 +481,7 @@
     <include location="global" impldecl="in implementation">ntqpushbutton.h</include>
     <include location="global" impldecl="in implementation">ntqcheckbox.h</include>
     <include location="global" impldecl="in implementation">ntqcolordialog.h</include>
-    <include location="global" impldecl="in implementation">ntqsettings.h</include>
+    <include location="global" impldecl="in implementation">tqsettings.h</include>
     <include location="local" impldecl="in implementation">preferences.ui.h</include>
 </includes>
 <variables>
diff --git a/tools/designer/editor/yyindent.cpp b/tools/designer/editor/yyindent.cpp
index 7b43cb7f2..f38926faf 100644
--- a/tools/designer/editor/yyindent.cpp
+++ b/tools/designer/editor/yyindent.cpp
@@ -1106,7 +1106,7 @@ int indentForBottomLine( const TQStringList& program, TQChar typedIn )
   Test driver.
 */
 
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqtextstream.h>
 
 #include <errno.h>
diff --git a/tools/designer/examples/addressbook/addressbook.ui.h b/tools/designer/examples/addressbook/addressbook.ui.h
index 2edd9f2b0..6964e40b2 100644
--- a/tools/designer/examples/addressbook/addressbook.ui.h
+++ b/tools/designer/examples/addressbook/addressbook.ui.h
@@ -8,9 +8,9 @@
 
 #include "addressdetails.h"
 #include "search.h"
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqtextstream.h>
-#include <ntqfiledialog.h>
+#include <tqfiledialog.h>
 #include <ntqapplication.h>
 
 void AddressBook::fileNew()
diff --git a/tools/designer/examples/colortool/mainform.ui b/tools/designer/examples/colortool/mainform.ui
index b4a4f4ed9..177ecfe5a 100644
--- a/tools/designer/examples/colortool/mainform.ui
+++ b/tools/designer/examples/colortool/mainform.ui
@@ -512,21 +512,21 @@
 </connections>
 <includes>
     <include location="local" impldecl="in declaration">findform.h</include>
-    <include location="local" impldecl="in implementation">ntqsettings.h</include>
+    <include location="local" impldecl="in implementation">tqsettings.h</include>
     <include location="local" impldecl="in implementation">ntqradiobutton.h</include>
     <include location="local" impldecl="in implementation">ntqcheckbox.h</include>
     <include location="local" impldecl="in implementation">colornameform.h</include>
     <include location="local" impldecl="in implementation">ntqcolordialog.h</include>
     <include location="local" impldecl="in implementation">tqregexp.h</include>
-    <include location="local" impldecl="in implementation">ntqfile.h</include>
-    <include location="local" impldecl="in implementation">ntqfiledialog.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">ntqcolor.h</include>
     <include location="local" impldecl="in implementation">tqstring.h</include>
     <include location="local" impldecl="in implementation">ntqpainter.h</include>
     <include location="local" impldecl="in implementation">tqstatusbar.h</include>
     <include location="local" impldecl="in implementation">ntqmessagebox.h</include>
-    <include location="local" impldecl="in implementation">ntqclipboard.h</include>
+    <include location="local" impldecl="in implementation">tqclipboard.h</include>
     <include location="local" impldecl="in implementation">ntqlabel.h</include>
     <include location="local" impldecl="in implementation">ntqlineedit.h</include>
     <include location="local" impldecl="in implementation">optionsform.h</include>
diff --git a/tools/designer/examples/filechooser/widget/filechooser.cpp b/tools/designer/examples/filechooser/widget/filechooser.cpp
index 4e886829e..97ff5d5b2 100644
--- a/tools/designer/examples/filechooser/widget/filechooser.cpp
+++ b/tools/designer/examples/filechooser/widget/filechooser.cpp
@@ -1,7 +1,7 @@
 #include "filechooser.h"
 #include <ntqlineedit.h>
 #include <ntqpushbutton.h>
-#include <ntqfiledialog.h>
+#include <tqfiledialog.h>
 #include <ntqlayout.h>
 
 FileChooser::FileChooser( TQWidget *parent, const char *name )
diff --git a/tools/designer/examples/multiclip/multiclip.ui b/tools/designer/examples/multiclip/multiclip.ui
index 7deb0b887..35c2b4e20 100644
--- a/tools/designer/examples/multiclip/multiclip.ui
+++ b/tools/designer/examples/multiclip/multiclip.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>MulticlipForm</class>
-<include location="global" impldecl="in declaration">ntqclipboard.h</include>
+<include location="global" impldecl="in declaration">tqclipboard.h</include>
 <include location="global" impldecl="in implementation">ntqapplication.h</include>
 <include location="local" implDecl="in declaration">multiclip.ui.h</include>
 <variable>TQClipboard *cb;</variable>
diff --git a/tools/designer/examples/richedit/richedit.ui b/tools/designer/examples/richedit/richedit.ui
index 7f166440b..c27ba8b46 100644
--- a/tools/designer/examples/richedit/richedit.ui
+++ b/tools/designer/examples/richedit/richedit.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>EditorForm</class>
-<include location="global" impldecl="in implementation">ntqfile.h</include>
+<include location="global" impldecl="in implementation">tqfile.h</include>
 <include location="global" impldecl="in implementation">ntqfontdatabase.h</include>
 <include location="global" impldecl="in implementation">ntqmessagebox.h</include>
 <include location="global" impldecl="in implementation">ntqapplication.h</include>
-<include location="global" impldecl="in implementation">ntqfiledialog.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>
 <variable>TQString fileName;</variable>
diff --git a/tools/designer/examples/sizeaware/sizeaware.cpp b/tools/designer/examples/sizeaware/sizeaware.cpp
index 621d36ead..1fe02528c 100644
--- a/tools/designer/examples/sizeaware/sizeaware.cpp
+++ b/tools/designer/examples/sizeaware/sizeaware.cpp
@@ -1,5 +1,5 @@
 #include "sizeaware.h"
-#include <ntqsettings.h>
+#include <tqsettings.h>
 
 
 SizeAware::SizeAware( TQDialog *parent, const char *name, bool modal )
diff --git a/tools/designer/plugins/cppeditor/cppbrowser.cpp b/tools/designer/plugins/cppeditor/cppbrowser.cpp
index 0d2044a40..2e05dd074 100644
--- a/tools/designer/plugins/cppeditor/cppbrowser.cpp
+++ b/tools/designer/plugins/cppeditor/cppbrowser.cpp
@@ -34,7 +34,7 @@
 
 #include "cppbrowser.h"
 #include <private/qrichtext_p.h>
-#include <ntqprocess.h>
+#include <tqprocess.h>
 #include <tqmainwindow.h>
 #include <tqstatusbar.h>
 #include <editor.h>
diff --git a/tools/designer/plugins/cppeditor/cppeditor.cpp b/tools/designer/plugins/cppeditor/cppeditor.cpp
index d06bdf388..3ba5afac6 100644
--- a/tools/designer/plugins/cppeditor/cppeditor.cpp
+++ b/tools/designer/plugins/cppeditor/cppeditor.cpp
@@ -38,7 +38,7 @@
 #include "cppcompletion.h"
 #include "cppbrowser.h"
 #include <parenmatcher.h>
-#include <ntqsettings.h>
+#include <tqsettings.h>
 #include <tqpopupmenu.h>
 #include <ntqinputdialog.h>
 #include <designerinterface.h>
diff --git a/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
index aba6008c1..3e7d81c07 100644
--- a/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
+++ b/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
@@ -35,7 +35,7 @@
 #include "languageinterfaceimpl.h"
 #include <tqobject.h>
 #include <designerinterface.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include "yyreg.h"
 #include <ntqmetaobject.h>
 
diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp
index 1babf6814..924eef889 100644
--- a/tools/designer/plugins/dlg/dlg2ui.cpp
+++ b/tools/designer/plugins/dlg/dlg2ui.cpp
@@ -35,7 +35,7 @@
 **********************************************************************/
 
 #include "dlg2ui.h"
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <ntqframe.h>
 #include <ntqmessagebox.h>
 #include <tqregexp.h>
diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp
index 7fee77e0b..460c0bbe6 100644
--- a/tools/designer/plugins/glade/glade2ui.cpp
+++ b/tools/designer/plugins/glade/glade2ui.cpp
@@ -37,7 +37,7 @@
 #include "glade2ui.h"
 
 #include <ntqapplication.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqimage.h>
 #include <ntqprogressdialog.h>
 #include <ntqmessagebox.h>
diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
index ccd7a31c9..86037c9dd 100644
--- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
+++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
@@ -33,7 +33,7 @@
 **********************************************************************/
 
 #include "kdevdlg2ui.h"
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <tqstring.h>
 #include <tqptrstack.h>
 
diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.h b/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
index 7ae909df1..c25f7ef33 100644
--- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
+++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
@@ -36,7 +36,7 @@
 #define KDEVDLG2UI_H
 
 #include <tqtextstream.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqstringlist.h>
 
 class KDEVDLG2UI
diff --git a/tools/designer/plugins/kdevdlg/main.cpp b/tools/designer/plugins/kdevdlg/main.cpp
index 1092d3dc0..57d293a29 100644
--- a/tools/designer/plugins/kdevdlg/main.cpp
+++ b/tools/designer/plugins/kdevdlg/main.cpp
@@ -36,7 +36,7 @@
 
 #include <ntqapplication.h>
 #include <tqstring.h>
-#include <ntqdir.h>
+#include <tqdir.h>
 
 #include "kdevdlg2ui.h"
 
diff --git a/tools/designer/plugins/rc/rc2ui.cpp b/tools/designer/plugins/rc/rc2ui.cpp
index d0d6c7af3..df37abdd9 100644
--- a/tools/designer/plugins/rc/rc2ui.cpp
+++ b/tools/designer/plugins/rc/rc2ui.cpp
@@ -33,7 +33,7 @@
 **********************************************************************/
 
 #include "rc2ui.h"
-#include <ntqdir.h>
+#include <tqdir.h>
 
 /// some little helpers ///
 
diff --git a/tools/designer/plugins/rc/rc2ui.h b/tools/designer/plugins/rc/rc2ui.h
index df2d13616..bf2610a36 100644
--- a/tools/designer/plugins/rc/rc2ui.h
+++ b/tools/designer/plugins/rc/rc2ui.h
@@ -36,7 +36,7 @@
 #define RC2UI_H
 
 #include <tqtextstream.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqstringlist.h>
 
 class RC2UI
diff --git a/tools/designer/shared/ui2uib.cpp b/tools/designer/shared/ui2uib.cpp
index e310576f0..990f66b36 100644
--- a/tools/designer/shared/ui2uib.cpp
+++ b/tools/designer/shared/ui2uib.cpp
@@ -40,7 +40,7 @@
 #include <ntqcursor.h>
 #include <tqdatetime.h>
 #include <tqdom.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <ntqfont.h>
 #include <tqobject.h>
 #include <ntqrect.h>
diff --git a/tools/designer/shared/uib.h b/tools/designer/shared/uib.h
index 47c6f08f2..5307595c6 100644
--- a/tools/designer/shared/uib.h
+++ b/tools/designer/shared/uib.h
@@ -34,7 +34,7 @@
 #ifndef UIB_H
 #define UIB_H
 
-#include <ntqdatastream.h>
+#include <tqdatastream.h>
 
 const TQ_UINT32 UibMagic = 0xb77c61d8;
 
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index ac5fbe6b9..c5430d785 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -39,7 +39,7 @@
 #include <globaldefs.h>
 #include <tqstrlist.h>
 #include <tqdict.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqtextstream.h>
 #include <ntqcleanuphandler.h>
 #include <ntqfeatures.h>
@@ -65,6 +65,7 @@ static bool was_in_setup = FALSE;
 static TQString converted_widgets[] =
 {
     "TQDateTimeEdit",
+    "TQFileDialog",
     "TQIconView",
     "TQMainWindow", "TQMenuBar",
     "TQPopupMenu",
diff --git a/tools/designer/tools/tqtconv2ui/main.cpp b/tools/designer/tools/tqtconv2ui/main.cpp
index d88fb9515..9ae6c558e 100644
--- a/tools/designer/tools/tqtconv2ui/main.cpp
+++ b/tools/designer/tools/tqtconv2ui/main.cpp
@@ -34,10 +34,10 @@
 #include <ntqapplication.h>
 #include <private/qpluginmanager_p.h>
 #include <tqstringlist.h>
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <stdio.h>
 #include "filterinterface.h"
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 
 class Conv2ui {
 public:
diff --git a/tools/designer/tools/tqtcreatecw/main.cpp b/tools/designer/tools/tqtcreatecw/main.cpp
index d2fba00fa..e925c9a67 100644
--- a/tools/designer/tools/tqtcreatecw/main.cpp
+++ b/tools/designer/tools/tqtcreatecw/main.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqvaluelist.h>
 #include <tqstrlist.h>
diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index 4cb531409..d16abc6cd 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -32,11 +32,11 @@
 **********************************************************************/
 
 #include "uic.h"
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqimage.h>
 #include <tqstringlist.h>
 #include <tqdatetime.h>
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <stdio.h>
 #include <ctype.h>
 
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index 7dbd4be3a..00a24784a 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -37,9 +37,9 @@
 #include "domtool.h"
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
-#include <ntqfile.h>
-#include <ntqfileinfo.h>
-#include <ntqdir.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqdir.h>
 #include <tqregexp.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
diff --git a/tools/designer/uic/main.cpp b/tools/designer/uic/main.cpp
index e8b1f726d..c754d73ed 100644
--- a/tools/designer/uic/main.cpp
+++ b/tools/designer/uic/main.cpp
@@ -37,10 +37,10 @@
 #include "ui2uib.h"
 #endif
 #include <ntqapplication.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqstringlist.h>
 #include <tqdatetime.h>
-#include <ntqsettings.h>
+#include <tqsettings.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 #include <stdio.h>
diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp
index 8f15973f2..dd07cf209 100644
--- a/tools/designer/uic/subclassing.cpp
+++ b/tools/designer/uic/subclassing.cpp
@@ -35,7 +35,7 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqstringlist.h>
 #include <tqdatetime.h>
 #define NO_STATIC_COLORS
diff --git a/tools/designer/uic/uic.cpp b/tools/designer/uic/uic.cpp
index 36db825b8..b044649b0 100644
--- a/tools/designer/uic/uic.cpp
+++ b/tools/designer/uic/uic.cpp
@@ -35,7 +35,7 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqstringlist.h>
 #include <tqdatetime.h>
 #define NO_STATIC_COLORS
diff --git a/tools/designer/uilib/tqwidgetfactory.cpp b/tools/designer/uilib/tqwidgetfactory.cpp
index b18b2e6aa..00234331a 100644
--- a/tools/designer/uilib/tqwidgetfactory.cpp
+++ b/tools/designer/uilib/tqwidgetfactory.cpp
@@ -39,7 +39,7 @@
 #include <ntqfeatures.h>
 #include "../designer/database2.h"
 #include <tqdom.h>
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <ntqlayout.h>
 #include <ntqmetaobject.h>
 #include <domtool.h>
@@ -1197,13 +1197,13 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
 	return 0;
     }
 
-    TQ_UINT8 qdatastreamVersion;
-    in >> qdatastreamVersion;
-    if ( (int) qdatastreamVersion > in.version() ) {
+    TQ_UINT8 tqdatastreamVersion;
+    in >> tqdatastreamVersion;
+    if ( (int) tqdatastreamVersion > in.version() ) {
 	tqWarning( "Incompatible version of TQt" );
 	return 0;
     }
-    in.setVersion( qdatastreamVersion );
+    in.setVersion( tqdatastreamVersion );
 
     UibStrTable strings;
     TQObject **objects = 0;