15 files changed, 41 insertions, 41 deletions
diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp
index 1f396f908..9c4c328a8 100644
--- a/tools/assistant/config.cpp
+++ b/tools/assistant/config.cpp
@@ -36,10 +36,10 @@
 #include "docuparser.h"
 
 #include <ntqapplication.h>
-#include <ntqdir.h>
-#include <ntqfile.h>
-#include <ntqfileinfo.h>
-#include <ntqsettings.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqsettings.h>
 #include <tqxml.h>
 
 static Config *static_configuration = 0;
diff --git a/tools/assistant/docuparser.cpp b/tools/assistant/docuparser.cpp
index b65dd8478..c1077d154 100644
--- a/tools/assistant/docuparser.cpp
+++ b/tools/assistant/docuparser.cpp
@@ -34,9 +34,9 @@
 #include "docuparser.h"
 #include "profile.h"
 
-#include <ntqdir.h>
-#include <ntqfile.h>
-#include <ntqfileinfo.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
 #include <tqregexp.h>
 #include <tqstring.h>
 #include <tqxml.h>
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index 49ae1a7f1..e8ced3b32 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -42,10 +42,10 @@
 #include <ntqaccel.h>
 #include <ntqapplication.h>
 #include <ntqcursor.h>
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <ntqeventloop.h>
-#include <ntqfile.h>
-#include <ntqfileinfo.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
 #include <ntqheader.h>
 #include <ntqlabel.h>
 #include <ntqlineedit.h>
@@ -56,13 +56,13 @@
 #include <tqptrstack.h>
 #include <ntqpushbutton.h>
 #include <tqregexp.h>
-#include <ntqsettings.h>
+#include <tqsettings.h>
 #include <tqstatusbar.h>
 #include <ntqtabwidget.h>
 #include <tqtextbrowser.h>
 #include <tqtextstream.h>
 #include <tqtimer.h>
-#include <ntqurl.h>
+#include <tqurl.h>
 #include <ntqvalidator.h>
 
 #include <stdlib.h>
diff --git a/tools/assistant/helpwindow.cpp b/tools/assistant/helpwindow.cpp
index fc013ac15..c43a42e8b 100644
--- a/tools/assistant/helpwindow.cpp
+++ b/tools/assistant/helpwindow.cpp
@@ -38,15 +38,15 @@
 #include "config.h"
 
 #include <ntqapplication.h>
-#include <ntqclipboard.h>
-#include <ntqurl.h>
+#include <tqclipboard.h>
+#include <tqurl.h>
 #include <ntqmessagebox.h>
-#include <ntqdir.h>
-#include <ntqfile.h>
-#include <ntqprocess.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqprocess.h>
 #include <tqpopupmenu.h>
 #include <tqaction.h>
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <ntqevent.h>
 #include <tqtextstream.h>
 #include <tqtextcodec.h>
diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp
index 02c986a1c..602dc9afe 100644
--- a/tools/assistant/index.cpp
+++ b/tools/assistant/index.cpp
@@ -33,8 +33,8 @@
 
 #include "index.h"
 
-#include <ntqfile.h>
-#include <ntqdir.h>
+#include <tqfile.h>
+#include <tqdir.h>
 #include <tqstringlist.h>
 #include <tqdict.h>
 #include <ntqapplication.h>
diff --git a/tools/assistant/index.h b/tools/assistant/index.h
index 448dd6cc6..597047b5a 100644
--- a/tools/assistant/index.h
+++ b/tools/assistant/index.h
@@ -36,7 +36,7 @@
 
 #include <tqstringlist.h>
 #include <tqdict.h>
-#include <ntqdatastream.h>
+#include <tqdatastream.h>
 #include <tqobject.h>
 
 struct Document {
diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp
index 1f9096114..48cbfa84b 100644
--- a/tools/assistant/lib/qassistantclient.cpp
+++ b/tools/assistant/lib/qassistantclient.cpp
@@ -33,11 +33,11 @@
 
 #include "ntqassistantclient.h"
 
-#include <ntqsocket.h>
+#include <tqsocket.h>
 #include <tqtextstream.h>
-#include <ntqprocess.h>
+#include <tqprocess.h>
 #include <tqtimer.h>
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 
 class TQAssistantClientPrivate
 {
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index df6039695..25ac3d821 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -36,12 +36,12 @@
 #include "config.h"
 
 #include <ntqapplication.h>
-#include <ntqserversocket.h>
-#include <ntqsocket.h>
+#include <tqserversocket.h>
+#include <tqsocket.h>
 #include <ntqpixmap.h>
 #include <tqptrlist.h>
 #include <tqstringlist.h>
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <ntqmessagebox.h>
 #include <ntqguardedptr.h>
 #include <stdlib.h>
diff --git a/tools/assistant/mainwindow.ui b/tools/assistant/mainwindow.ui
index 80e8e0a14..7d39b7212 100644
--- a/tools/assistant/mainwindow.ui
+++ b/tools/assistant/mainwindow.ui
@@ -578,7 +578,7 @@
     <include location="global" impldecl="in implementation">ntqcombobox.h</include>
     <include location="global" impldecl="in implementation">ntqpaintdevicemetrics.h</include>
     <include location="global" impldecl="in implementation">ntqsimplerichtext.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">tqtextstream.h</include>
     <include location="global" impldecl="in implementation">ntqdockwindow.h</include>
     <include location="global" impldecl="in implementation">stdlib.h</include>
@@ -587,13 +587,13 @@
     <include location="global" impldecl="in implementation">tqstylesheet.h</include>
     <include location="global" impldecl="in implementation">ntqapplication.h</include>
     <include location="local" impldecl="in implementation">helpdialogimpl.h</include>
-    <include location="global" impldecl="in implementation">ntqdir.h</include>
+    <include location="global" impldecl="in implementation">tqdir.h</include>
     <include location="global" impldecl="in implementation">ntqprinter.h</include>
     <include location="global" impldecl="in implementation">ntqpainter.h</include>
-    <include location="global" impldecl="in implementation">ntqurl.h</include>
+    <include location="global" impldecl="in implementation">tqurl.h</include>
     <include location="global" impldecl="in implementation">tqstatusbar.h</include>
     <include location="global" impldecl="in implementation">ntqlineedit.h</include>
-    <include location="global" impldecl="in implementation">ntqsettings.h</include>
+    <include location="global" impldecl="in implementation">tqsettings.h</include>
     <include location="global" impldecl="in implementation">ntqcheckbox.h</include>
     <include location="local" impldecl="in implementation">tabbedbrowser.h</include>
     <include location="global" impldecl="in declaration">tqptrlist.h</include>
diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h
index de2fa4c68..d5a997d5d 100644
--- a/tools/assistant/mainwindow.ui.h
+++ b/tools/assistant/mainwindow.ui.h
@@ -34,7 +34,7 @@
 #include "config.h"
 
 #include <ntqtabwidget.h>
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <ntqaccel.h>
 #include <tqobjectlist.h>
 #include <tqtimer.h>
diff --git a/tools/assistant/profile.cpp b/tools/assistant/profile.cpp
index 8f18733ab..a02170de7 100644
--- a/tools/assistant/profile.cpp
+++ b/tools/assistant/profile.cpp
@@ -33,9 +33,9 @@
 #include "profile.h"
 #include <tqxml.h>
 #include <tqtextcodec.h>
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <tqregexp.h>
-#include <ntqdir.h>
+#include <tqdir.h>
 
 #define QT_TITLE "TQt Reference Documentation"
 #define DESIGNER_TITLE "TQt Designer Manual"
diff --git a/tools/assistant/profile.h b/tools/assistant/profile.h
index d3732605b..f06dff0f9 100644
--- a/tools/assistant/profile.h
+++ b/tools/assistant/profile.h
@@ -34,7 +34,7 @@
 #ifndef PROFILE_H
 #define PROFILE_H
 
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
diff --git a/tools/assistant/settingsdialogimpl.cpp b/tools/assistant/settingsdialogimpl.cpp
index 87e3b9d8d..456359cdf 100644
--- a/tools/assistant/settingsdialogimpl.cpp
+++ b/tools/assistant/settingsdialogimpl.cpp
@@ -39,15 +39,15 @@
 #include <ntqpushbutton.h>
 #include <ntqcheckbox.h>
 #include <ntqcolordialog.h>
-#include <ntqdir.h>
-#include <ntqfiledialog.h>
-#include <ntqfileinfo.h>
+#include <tqdir.h>
+#include <tqfiledialog.h>
+#include <tqfileinfo.h>
 #include <ntqlineedit.h>
 #include <ntqlistbox.h>
 #include <ntqlistview.h>
 #include <ntqmessagebox.h>
 #include <tqptrstack.h>
-#include <ntqsettings.h>
+#include <tqsettings.h>
 #include <tqtimer.h>
 #include <tqtoolbutton.h>
 #include <ntqtabwidget.h>
diff --git a/tools/assistant/tabbedbrowser.ui b/tools/assistant/tabbedbrowser.ui
index ddc3261eb..e1a87a497 100644
--- a/tools/assistant/tabbedbrowser.ui
+++ b/tools/assistant/tabbedbrowser.ui
@@ -78,7 +78,7 @@
     </grid>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">ntqsettings.h</include>
+    <include location="global" impldecl="in declaration">tqsettings.h</include>
     <include location="local" impldecl="in implementation">helpwindow.h</include>
     <include location="local" impldecl="in implementation">mainwindow.h</include>
     <include location="global" impldecl="in implementation">tqstylesheet.h</include>
diff --git a/tools/assistant/tabbedbrowser.ui.h b/tools/assistant/tabbedbrowser.ui.h
index ddd9dc5e1..5c021a7e2 100644
--- a/tools/assistant/tabbedbrowser.ui.h
+++ b/tools/assistant/tabbedbrowser.ui.h
@@ -7,7 +7,7 @@
 ** place of a destructor.
 *****************************************************************************/
 
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 #include <tqtoolbutton.h>
 #include <ntqpixmap.h>
 #include <tqiconset.h>