Rename text nt* related files to equivalent tq*

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

60 files changed, 76 insertions, 75 deletions

diff --git a/tools/assistant/finddialog.ui b/tools/assistant/finddialog.ui
index 160bb043..ed4bf64d 100644
--- a/tools/assistant/finddialog.ui
+++ b/tools/assistant/finddialog.ui
@@ -249,7 +249,7 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in implementation">ntqstatusbar.h</include>
-    <include location="global" impldecl="in implementation">ntqtextbrowser.h</include>
+    <include location="global" impldecl="in implementation">tqtextbrowser.h</include>
     <include location="local" impldecl="in implementation">mainwindow.h</include>
     <include location="local" impldecl="in implementation">tabbedbrowser.h</include>
     <include location="local" impldecl="in implementation">finddialog.ui.h</include>
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index 0e8623b9..ab02f2a1 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -59,8 +59,8 @@
 #include <ntqsettings.h>
 #include <ntqstatusbar.h>
 #include <ntqtabwidget.h>
-#include <ntqtextbrowser.h>
-#include <ntqtextstream.h>
+#include <tqtextbrowser.h>
+#include <tqtextstream.h>
 #include <ntqtimer.h>
 #include <ntqurl.h>
 #include <ntqvalidator.h>
diff --git a/tools/assistant/helpwindow.cpp b/tools/assistant/helpwindow.cpp
index 175bc577..349f8a4d 100644
--- a/tools/assistant/helpwindow.cpp
+++ b/tools/assistant/helpwindow.cpp
@@ -48,8 +48,8 @@
 #include <ntqaction.h>
 #include <ntqfileinfo.h>
 #include <ntqevent.h>
-#include <ntqtextstream.h>
-#include <ntqtextcodec.h>
+#include <tqtextstream.h>
+#include <tqtextcodec.h>
 
 #if defined(Q_OS_WIN32)
 #include <windows.h>
diff --git a/tools/assistant/helpwindow.h b/tools/assistant/helpwindow.h
index 8ec8f04a..85cfad90 100644
--- a/tools/assistant/helpwindow.h
+++ b/tools/assistant/helpwindow.h
@@ -34,7 +34,7 @@
 #ifndef HELPWINDOW_H
 #define HELPWINDOW_H
 
-#include <ntqtextbrowser.h>
+#include <tqtextbrowser.h>
 
 class MainWindow;
 class TQKeyEvent;
diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp
index 56eda22e..87ba3bef 100644
--- a/tools/assistant/lib/qassistantclient.cpp
+++ b/tools/assistant/lib/qassistantclient.cpp
@@ -34,7 +34,7 @@
 #include "ntqassistantclient.h"
 
 #include <ntqsocket.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <ntqprocess.h>
 #include <ntqtimer.h>
 #include <ntqfileinfo.h>
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index 22bcedd6..df603969 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -46,7 +46,7 @@
 #include <ntqguardedptr.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <ntqtextcodec.h>
+#include <tqtextcodec.h>
 
 #ifdef TQ_WS_WIN
 #define INDEX_CHECK( text ) if( i+1 >= argc ) { TQMessageBox::information( 0, "TQt Assistant", text ); return 1; }
diff --git a/tools/assistant/mainwindow.ui b/tools/assistant/mainwindow.ui
index bb06b004..6461c640 100644
--- a/tools/assistant/mainwindow.ui
+++ b/tools/assistant/mainwindow.ui
@@ -579,7 +579,7 @@
     <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">ntqtextstream.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>
     <include location="global" impldecl="in implementation">ntqmime.h</include>
diff --git a/tools/assistant/profile.cpp b/tools/assistant/profile.cpp
index 12a787b3..37cf3576 100644
--- a/tools/assistant/profile.cpp
+++ b/tools/assistant/profile.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 #include "profile.h"
 #include <tqxml.h>
-#include <ntqtextcodec.h>
+#include <tqtextcodec.h>
 #include <ntqfileinfo.h>
 #include <ntqregexp.h>
 #include <ntqdir.h>
diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp
index 3a980ad7..17ed552b 100644
--- a/tools/designer/app/main.cpp
+++ b/tools/designer/app/main.cpp
@@ -43,7 +43,7 @@
 
 #include "designerapp.h"
 
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <tqobjectlist.h>
 #include <ntqsettings.h>
 #include <ntqsplashscreen.h>
diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp
index 51bb600a..fd33209b 100644
--- a/tools/designer/designer/command.cpp
+++ b/tools/designer/designer/command.cpp
@@ -54,7 +54,7 @@
 #include <ntqmessagebox.h>
 #include <ntqlistbox.h>
 #include <ntqiconview.h>
-#include <ntqtextedit.h>
+#include <tqtextedit.h>
 #include <tqptrstack.h>
 #include <ntqheader.h>
 #include <ntqsplitter.h>
diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp
index e3726e1d..3d3196f8 100644
--- a/tools/designer/designer/customwidgeteditorimpl.cpp
+++ b/tools/designer/designer/customwidgeteditorimpl.cpp
@@ -53,9 +53,9 @@
 #include <ntqapplication.h>
 #include <ntqlistview.h>
 #include <ntqfile.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <tqdom.h>
-#include <ntqtextcodec.h>
+#include <tqtextcodec.h>
 #include <ntqcheckbox.h>
 
 CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw )
diff --git a/tools/designer/designer/designerappiface.cpp b/tools/designer/designer/designerappiface.cpp
index c6ac96c7..b808f323 100644
--- a/tools/designer/designer/designerappiface.cpp
+++ b/tools/designer/designer/designerappiface.cpp
@@ -44,7 +44,7 @@
 #include "../shared/widgetdatabase.h"
 #include <ntqvariant.h>
 #include <ntqlistview.h>
-#include <ntqtextedit.h>
+#include <tqtextedit.h>
 #include <ntqstatusbar.h>
 #include "pixmapcollection.h"
 #include "hierarchyview.h"
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 18a4579f..6da30984 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -116,7 +116,7 @@
 #include <ntqaccel.h>
 #include <ntqtooltip.h>
 #include <ntqsizegrip.h>
-#include <ntqtextview.h>
+#include <tqtextview.h>
 #include <ntqassistantclient.h>
 #include <stdlib.h>
 
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index d7699dca..52b6e7a0 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -52,7 +52,7 @@
 #include <ntqspinbox.h>
 #include <ntqinputdialog.h>
 #include <ntqdatetimeedit.h>
-#include <ntqtextedit.h>
+#include <tqtextedit.h>
 
 #include "defs.h"
 #include "project.h"
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index 9203f7f8..90e32d33 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -55,7 +55,7 @@
 #include <ntqdatetime.h>
 #include <ntqfile.h>
 #include <ntqfileinfo.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 
 #include <stdlib.h>
 
diff --git a/tools/designer/designer/multilineeditorimpl.cpp b/tools/designer/designer/multilineeditorimpl.cpp
index 709ebd59..4e6013f6 100644
--- a/tools/designer/designer/multilineeditorimpl.cpp
+++ b/tools/designer/designer/multilineeditorimpl.cpp
@@ -39,7 +39,7 @@
 #include "syntaxhighlighter_html.h"
 #include "widgetfactory.h"
 
-#include <ntqtextedit.h>
+#include <tqtextedit.h>
 #include <./private/qrichtext_p.h>
 #include <ntqpushbutton.h>
 #include <ntqlayout.h>
diff --git a/tools/designer/designer/multilineeditorimpl.h b/tools/designer/designer/multilineeditorimpl.h
index 11c7233c..30b875ba 100644
--- a/tools/designer/designer/multilineeditorimpl.h
+++ b/tools/designer/designer/multilineeditorimpl.h
@@ -35,7 +35,7 @@
 #define MULTILINEEDITORIMPL_H
 
 #include <ntqaction.h>
-#include <ntqtextedit.h>
+#include <tqtextedit.h>
 #include <private/qrichtext_p.h>
 #include "multilineeditor.h"
 
diff --git a/tools/designer/designer/outputwindow.cpp b/tools/designer/designer/outputwindow.cpp
index 89c0b055..4dc59ab4 100644
--- a/tools/designer/designer/outputwindow.cpp
+++ b/tools/designer/designer/outputwindow.cpp
@@ -37,7 +37,7 @@
 #include "mainwindow.h"
 
 #include <ntqlistview.h>
-#include <ntqtextedit.h>
+#include <tqtextedit.h>
 #include <ntqapplication.h>
 #include <ntqheader.h>
 #include <stdlib.h>
diff --git a/tools/designer/designer/pixmapcollection.cpp b/tools/designer/designer/pixmapcollection.cpp
index 0a94c591..22405ce1 100644
--- a/tools/designer/designer/pixmapcollection.cpp
+++ b/tools/designer/designer/pixmapcollection.cpp
@@ -37,7 +37,7 @@
 #include <ntqmime.h>
 #include <ntqdir.h>
 #include <ntqfileinfo.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <tqimage.h>
 
 PixmapCollection::PixmapCollection( Project *pro )
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index a21ac205..d567b79e 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -44,11 +44,11 @@
 #include "outputwindow.h"
 
 #include <ntqfile.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <ntqurl.h>
 #include <tqobjectlist.h>
 #include <ntqfeatures.h>
-#include <ntqtextcodec.h>
+#include <tqtextcodec.h>
 #include <tqdom.h>
 #include <ntqmessagebox.h>
 #include <ntqapplication.h>
diff --git a/tools/designer/designer/projectsettingsimpl.cpp b/tools/designer/designer/projectsettingsimpl.cpp
index d7663801..0a4a724d 100644
--- a/tools/designer/designer/projectsettingsimpl.cpp
+++ b/tools/designer/designer/projectsettingsimpl.cpp
@@ -42,7 +42,7 @@
 #include "workspace.h"
 
 #include <ntqlineedit.h>
-#include <ntqtextedit.h>
+#include <tqtextedit.h>
 #include <ntqcheckbox.h>
 #include <ntqfiledialog.h>
 #include <ntqcombobox.h>
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 85b2b2ec..436d6a75 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -88,7 +88,7 @@
 #include <ntqmultilineedit.h> // FIXME: obsolete
 #include <ntqsplitter.h>
 #include <tqdatatable.h>
-#include <ntqtextview.h>
+#include <tqtextview.h>
 
 #include <limits.h>
 
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index 1d0d3d2b..9655ee4e 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -76,8 +76,8 @@
 #endif
 #include <ntqtabwidget.h>
 #include <ntqtabwidget.h>
-#include <ntqtextcodec.h>
-#include <ntqtextstream.h>
+#include <tqtextcodec.h>
+#include <tqtextstream.h>
 #include <ntqtooltip.h>
 #include <ntqwhatsthis.h>
 #include <tqwidget.h>
diff --git a/tools/designer/designer/resource.h b/tools/designer/designer/resource.h
index a8580dae..ff88271e 100644
--- a/tools/designer/designer/resource.h
+++ b/tools/designer/designer/resource.h
@@ -35,7 +35,7 @@
 #define RESOURCE_H
 
 #include <tqstring.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <ntqvariant.h>
 #include <tqvaluelist.h>
 #include <tqimage.h>
diff --git a/tools/designer/designer/sourceeditor.cpp b/tools/designer/designer/sourceeditor.cpp
index 32df118b..06ec283b 100644
--- a/tools/designer/designer/sourceeditor.cpp
+++ b/tools/designer/designer/sourceeditor.cpp
@@ -43,7 +43,7 @@
 #include "sourcefile.h"
 #include "hierarchyview.h"
 #include <ntqmessagebox.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 
 SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface )
     : TQVBox( parent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 )
diff --git a/tools/designer/designer/sourcefile.cpp b/tools/designer/designer/sourcefile.cpp
index bdb6299d..200a06a8 100644
--- a/tools/designer/designer/sourcefile.cpp
+++ b/tools/designer/designer/sourcefile.cpp
@@ -33,7 +33,7 @@
 
 #include "sourcefile.h"
 #include <ntqfile.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include "designerappiface.h"
 #include "sourceeditor.h"
 #include "metadatabase.h"
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index d5ef3df8..30f10c09 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -67,7 +67,7 @@
 #include <ntqlineedit.h>
 #include <ntqspinbox.h>
 #include <ntqmultilineedit.h>
-#include <ntqtextedit.h>
+#include <tqtextedit.h>
 #include <ntqlabel.h>
 #include <ntqlayout.h>
 #include <tqwidgetstack.h>
@@ -80,8 +80,8 @@
 #include <ntqslider.h>
 #include <ntqdial.h>
 #include <ntqprogressbar.h>
-#include <ntqtextview.h>
-#include <ntqtextbrowser.h>
+#include <tqtextview.h>
+#include <tqtextbrowser.h>
 #include <ntqframe.h>
 #include <ntqmetaobject.h>
 #include <tqwidgetstack.h>
diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp
index fa02c86c..209dbba6 100644
--- a/tools/designer/designer/workspace.cpp
+++ b/tools/designer/designer/workspace.cpp
@@ -52,7 +52,7 @@
 #include <tqobjectlist.h>
 #include <ntqworkspace.h>
 #include <ntqpopupmenu.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include "qcompletionedit.h"
 
 WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p )
diff --git a/tools/designer/editor/editor.h b/tools/designer/editor/editor.h
index 06039431..0be972de 100644
--- a/tools/designer/editor/editor.h
+++ b/tools/designer/editor/editor.h
@@ -34,7 +34,7 @@
 #ifndef EDITOR_H
 #define EDITOR_H
 
-#include <ntqtextedit.h>
+#include <tqtextedit.h>
 
 struct Config;
 class ParenMatcher;
diff --git a/tools/designer/editor/parenmatcher.cpp b/tools/designer/editor/parenmatcher.cpp
index ddc4b883..9f72a65d 100644
--- a/tools/designer/editor/parenmatcher.cpp
+++ b/tools/designer/editor/parenmatcher.cpp
@@ -34,7 +34,7 @@
 #include "parenmatcher.h"
 #include "paragdata.h"
 
-#include "ntqtextedit.h"
+#include "tqtextedit.h"
 #include <private/qrichtext_p.h>
 #include <ntqapplication.h>
 
diff --git a/tools/designer/editor/yyindent.cpp b/tools/designer/editor/yyindent.cpp
index d8498dc3..4851c572 100644
--- a/tools/designer/editor/yyindent.cpp
+++ b/tools/designer/editor/yyindent.cpp
@@ -1107,7 +1107,7 @@ int indentForBottomLine( const TQStringList& program, TQChar typedIn )
 */
 
 #include <ntqfile.h>
-#include <ntqtextstream.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 93f3d50e..2edd9f2b 100644
--- a/tools/designer/examples/addressbook/addressbook.ui.h
+++ b/tools/designer/examples/addressbook/addressbook.ui.h
@@ -9,7 +9,7 @@
 #include "addressdetails.h"
 #include "search.h"
 #include <ntqfile.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <ntqfiledialog.h>
 #include <ntqapplication.h>
 
diff --git a/tools/designer/examples/richedit/richedit.ui b/tools/designer/examples/richedit/richedit.ui
index 83b2381d..7f166440 100644
--- a/tools/designer/examples/richedit/richedit.ui
+++ b/tools/designer/examples/richedit/richedit.ui
@@ -5,7 +5,7 @@
 <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">ntqtextstream.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>
 <pixmapinproject/>
diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp
index a8993465..2f6a6b1b 100644
--- a/tools/designer/plugins/dlg/dlg2ui.cpp
+++ b/tools/designer/plugins/dlg/dlg2ui.cpp
@@ -39,7 +39,7 @@
 #include <ntqframe.h>
 #include <ntqmessagebox.h>
 #include <ntqregexp.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 
 /*
   Possible improvements:
diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.h b/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
index ff7d1955..7ae909df 100644
--- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
+++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
@@ -35,7 +35,7 @@
 #ifndef KDEVDLG2UI_H
 #define KDEVDLG2UI_H
 
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <ntqfile.h>
 #include <tqstringlist.h>
 
diff --git a/tools/designer/plugins/rc/rc2ui.h b/tools/designer/plugins/rc/rc2ui.h
index 87a6fb98..df2d1361 100644
--- a/tools/designer/plugins/rc/rc2ui.h
+++ b/tools/designer/plugins/rc/rc2ui.h
@@ -35,7 +35,7 @@
 #ifndef RC2UI_H
 #define RC2UI_H
 
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <ntqfile.h>
 #include <tqstringlist.h>
 
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index 5435526f..a7585d89 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -40,7 +40,7 @@
 #include <tqstrlist.h>
 #include <ntqdict.h>
 #include <ntqfile.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <ntqcleanuphandler.h>
 #include <ntqfeatures.h>
 
@@ -64,6 +64,7 @@ static bool was_in_setup = FALSE;
 // It will be removed afterwards
 static TQString converted_widgets[] =
 {
+    "TQTextBrowser", "TQTextEdit", "TQTextView",
     "TQWidget", "TQWidgetStack",
 };
 size_t converted_widgets_size = sizeof(converted_widgets) / sizeof(TQString);
diff --git a/tools/designer/tools/tqtcreatecw/main.cpp b/tools/designer/tools/tqtcreatecw/main.cpp
index aef6cea6..d2fba00f 100644
--- a/tools/designer/tools/tqtcreatecw/main.cpp
+++ b/tools/designer/tools/tqtcreatecw/main.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include <ntqfile.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <tqvaluelist.h>
 #include <tqstrlist.h>
 #include <ntqmetaobject.h>
diff --git a/tools/designer/uic/uic.h b/tools/designer/uic/uic.h
index 81aaa74a..93fdad2c 100644
--- a/tools/designer/uic/uic.h
+++ b/tools/designer/uic/uic.h
@@ -37,7 +37,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <ntqpalette.h>
 #include <ntqvariant.h>
 
diff --git a/tools/designer/uilib/tqwidgetfactory.cpp b/tools/designer/uilib/tqwidgetfactory.cpp
index e8e6c33a..420bdc8c 100644
--- a/tools/designer/uilib/tqwidgetfactory.cpp
+++ b/tools/designer/uilib/tqwidgetfactory.cpp
@@ -83,14 +83,14 @@
 #include <ntqwizard.h>
 #include <ntqlcdnumber.h>
 #include <ntqprogressbar.h>
-#include <ntqtextview.h>
-#include <ntqtextbrowser.h>
+#include <tqtextview.h>
+#include <tqtextbrowser.h>
 #include <ntqdial.h>
 #include <ntqslider.h>
 #include <ntqframe.h>
 #include <tqwidgetstack.h>
 #include <ntqtoolbox.h>
-#include <ntqtextedit.h>
+#include <tqtextedit.h>
 #include <ntqscrollbar.h>
 #include <ntqmainwindow.h>
 #include <ntqsplitter.h>
diff --git a/tools/linguist/book/linguist-manager.leaf b/tools/linguist/book/linguist-manager.leaf
index 9acf9263..15d2d736 100644
--- a/tools/linguist/book/linguist-manager.leaf
+++ b/tools/linguist/book/linguist-manager.leaf
@@ -56,12 +56,12 @@ An example of a complete \c .pro file with four translation source files:
 \index Chinese Language
 \index Japanese Language
 
-\l QTextCodec::setCodecForTr() makes it possible to choose a
+\l TQTextCodec::setCodecForTr() makes it possible to choose a
 8-bit encoding for literal strings that appear within \c tr() calls.
 This is useful for applications whose source language is, for example,
 Chinese or Japanese. If no encoding is set, \c tr() uses Latin-1.
 
-If you do use the \l QTextCodec::codecForTr() mechanism in your
+If you do use the \l TQTextCodec::codecForTr() mechanism in your
 application, \e {Qt Linguist} needs you to set the \c DEFAULTCODEC
 entry in the \c .pro file as well. For example:
 \code
diff --git a/tools/linguist/book/linguist-programmer.leaf b/tools/linguist/book/linguist-programmer.leaf
index 120dab0f..eff9422c 100644
--- a/tools/linguist/book/linguist-programmer.leaf
+++ b/tools/linguist/book/linguist-programmer.leaf
@@ -669,13 +669,13 @@ Our \c main() function is defined in \c main.cpp as usual.
 \printline QTranslator
 \printuntil install
 
-\index QTextCodec!locale()
-\index locale()!QTextCodec
+\index TQTextCodec!locale()
+\index locale()!TQTextCodec
 \index LANG!Environment Variable
 \index Environment Variables!LANG
 
 We choose which translation to use according to the current locale.
-\l QTextCodec::locale() can be influenced by setting the \c LANG
+\l TQTextCodec::locale() can be influenced by setting the \c LANG
 environment variable, for example. Notice that the use of a naming
 convention that incorporates the locale for \c .qm message files,
 (and \c .ts files), makes it easy to implement choosing the
diff --git a/tools/linguist/linguist/main.cpp b/tools/linguist/linguist/main.cpp
index 92704776..59ea00c4 100644
--- a/tools/linguist/linguist/main.cpp
+++ b/tools/linguist/linguist/main.cpp
@@ -37,7 +37,7 @@
 #include <ntqlabel.h>
 #include <ntqpixmap.h>
 #include <ntqtimer.h>
-#include <ntqtextcodec.h>
+#include <tqtextcodec.h>
 #include <ntqtranslator.h>
 #include <ntqsettings.h>
 #include <ntqsplashscreen.h>
diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp
index cce5f279..d68dfa09 100644
--- a/tools/linguist/linguist/msgedit.cpp
+++ b/tools/linguist/linguist/msgedit.cpp
@@ -47,11 +47,11 @@
 #include <ntqclipboard.h>
 #include <ntqlabel.h>
 #include <ntqlayout.h>
-#include <ntqtextedit.h>
+#include <tqtextedit.h>
 #include <ntqpalette.h>
 #include <ntqpushbutton.h>
 #include <tqstring.h>
-#include <ntqtextview.h>
+#include <tqtextview.h>
 #include <ntqwhatsthis.h>
 #include <ntqvbox.h>
 #include <ntqmainwindow.h>
diff --git a/tools/linguist/linguist/phrase.cpp b/tools/linguist/linguist/phrase.cpp
index 604187f3..de63b643 100644
--- a/tools/linguist/linguist/phrase.cpp
+++ b/tools/linguist/linguist/phrase.cpp
@@ -38,7 +38,7 @@
 #include <ntqfile.h>
 #include <ntqmessagebox.h>
 #include <ntqregexp.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <tqxml.h>
 
 static TQString protect( const TQString& str )
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index 29561e09..a20bd5cc 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -40,7 +40,7 @@
 #include <ntqregexp.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 
 #include <errno.h>
 
diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp
index 1539a57d..3295dbaf 100644
--- a/tools/linguist/lupdate/fetchtr.cpp
+++ b/tools/linguist/lupdate/fetchtr.cpp
@@ -36,7 +36,7 @@
 #include <ntqfile.h>
 #include <ntqregexp.h>
 #include <tqstring.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <tqvaluestack.h>
 #include <tqxml.h>
 
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 3c0e170a..53213d0c 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -39,7 +39,7 @@
 #include <ntqfileinfo.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 
 #include <errno.h>
 #include <string.h>
diff --git a/tools/linguist/shared/metatranslator.cpp b/tools/linguist/shared/metatranslator.cpp
index 73e435d0..aabd5d28 100644
--- a/tools/linguist/shared/metatranslator.cpp
+++ b/tools/linguist/shared/metatranslator.cpp
@@ -37,8 +37,8 @@
 #include <ntqcstring.h>
 #include <ntqfile.h>
 #include <ntqmessagebox.h>
-#include <ntqtextcodec.h>
-#include <ntqtextstream.h>
+#include <tqtextcodec.h>
+#include <tqtextstream.h>
 #include <tqxml.h>
 
 static bool encodingIsUtf8( const TQXmlAttributes& atts )
diff --git a/tools/linguist/shared/proparser.cpp b/tools/linguist/shared/proparser.cpp
index fea00880..f4a6d8de 100644
--- a/tools/linguist/shared/proparser.cpp
+++ b/tools/linguist/shared/proparser.cpp
@@ -38,7 +38,7 @@
 #include <ntqfileinfo.h>
 #include <ntqregexp.h>
 #include <tqstringlist.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 
 #ifdef Q_OS_UNIX
 #include <unistd.h>
diff --git a/tools/linguist/tutorial/tt2/main.cpp b/tools/linguist/tutorial/tt2/main.cpp
index 80b60864..3c5a4f6d 100644
--- a/tools/linguist/tutorial/tt2/main.cpp
+++ b/tools/linguist/tutorial/tt2/main.cpp
@@ -8,7 +8,7 @@
 
 #include <ntqapplication.h>
 #include <tqstring.h>
-#include <ntqtextcodec.h>
+#include <tqtextcodec.h>
 #include <ntqtranslator.h>
 
 int main( int argc, char **argv )
diff --git a/tools/linguist/tutorial/tt3/main.cpp b/tools/linguist/tutorial/tt3/main.cpp
index aa69e799..45b5c572 100644
--- a/tools/linguist/tutorial/tt3/main.cpp
+++ b/tools/linguist/tutorial/tt3/main.cpp
@@ -8,7 +8,7 @@
 
 #include <ntqapplication.h>
 #include <tqstring.h>
-#include <ntqtextcodec.h>
+#include <tqtextcodec.h>
 #include <ntqtranslator.h>
 
 int main( int argc, char **argv )
diff --git a/tools/maketqpf/main.cpp b/tools/maketqpf/main.cpp
index 06ae1401..d08bf613 100644
--- a/tools/maketqpf/main.cpp
+++ b/tools/maketqpf/main.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include <ntqapplication.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <ntqscrollview.h>
 #include <ntqfile.h>
 #include <ntqfont.h>
diff --git a/tools/msg2tqm/msg2tqm.cpp b/tools/msg2tqm/msg2tqm.cpp
index 07c2ff46..d167455a 100644
--- a/tools/msg2tqm/msg2tqm.cpp
+++ b/tools/msg2tqm/msg2tqm.cpp
@@ -33,8 +33,8 @@
 **********************************************************************/
 
 #include <ntqfile.h>
-#include <ntqtextstream.h>
-#include <ntqtextcodec.h>
+#include <tqtextstream.h>
+#include <tqtextcodec.h>
 #include <ntqtranslator.h>
 
 #include <stdio.h>
diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp
index a34e2a66..d246f33e 100644
--- a/tools/qconfig/main.cpp
+++ b/tools/qconfig/main.cpp
@@ -34,7 +34,7 @@
 #include "main.h"
 #include <ntqapplication.h>
 #include <ntqfile.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <ntqlistview.h>
 #include <ntqhbox.h>
 #include <ntqlabel.h>
diff --git a/tools/qconfig/main.h b/tools/qconfig/main.h
index 32ee6f2e..9075157c 100644
--- a/tools/qconfig/main.h
+++ b/tools/qconfig/main.h
@@ -34,7 +34,7 @@
 #include <ntqmainwindow.h>
 #include <tqmap.h>
 #include <tqstringlist.h>
-#include <ntqtextbrowser.h>
+#include <tqtextbrowser.h>
 
 class ChoiceItem;
 class TQListViewItem;
diff --git a/tools/qembed/qembed.cpp b/tools/qembed/qembed.cpp
index 6aaa6070..18919b31 100644
--- a/tools/qembed/qembed.cpp
+++ b/tools/qembed/qembed.cpp
@@ -20,7 +20,7 @@
 #include <ntqfile.h>
 #include <ntqfileinfo.h>
 #include <tqptrlist.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <ntqdatetime.h>
 #include <tqimage.h>
 #include <ntqdict.h>
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 14edb1ef..c97d2f6c 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -52,7 +52,7 @@
 #include <ntqstatusbar.h>
 #include <ntqsettings.h>
 #include <ntqmessagebox.h>
-#include <ntqtextview.h>
+#include <tqtextview.h>
 #include <ntqstyle.h>
 
 #include <stdlib.h>
diff --git a/tools/tqtmergetr/tqtmergetr.cpp b/tools/tqtmergetr/tqtmergetr.cpp
index 91296e37..b8925d2c 100644
--- a/tools/tqtmergetr/tqtmergetr.cpp
+++ b/tools/tqtmergetr/tqtmergetr.cpp
@@ -33,7 +33,7 @@
 
 #include <ntqfile.h>
 #include <ntqbuffer.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/tqvfb/skin.cpp b/tools/tqvfb/skin.cpp
index 02a65b65..a46e0a69 100644
--- a/tools/tqvfb/skin.cpp
+++ b/tools/tqvfb/skin.cpp
@@ -37,7 +37,7 @@
 
 #include <ntqbitmap.h>
 #include <ntqpixmap.h>
-#include <ntqtextstream.h>
+#include <tqtextstream.h>
 #include <ntqfile.h>
 #include <ntqpainter.h>
 #ifdef TQ_WS_MAC