Rename utility class nt* related files to equivalent tq*

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

53 files changed, 64 insertions, 64 deletions

diff --git a/tools/assistant/docuparser.cpp b/tools/assistant/docuparser.cpp
index e0e3609d0..b65dd8478 100644
--- a/tools/assistant/docuparser.cpp
+++ b/tools/assistant/docuparser.cpp
@@ -37,7 +37,7 @@
 #include <ntqdir.h>
 #include <ntqfile.h>
 #include <ntqfileinfo.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <tqstring.h>
 #include <tqxml.h>
 
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index 18c188f78..49ae1a7f1 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -55,7 +55,7 @@
 #include <tqptrlist.h>
 #include <tqptrstack.h>
 #include <ntqpushbutton.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <ntqsettings.h>
 #include <tqstatusbar.h>
 #include <ntqtabwidget.h>
diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h
index 678f5b428..0144943d6 100644
--- a/tools/assistant/helpdialogimpl.h
+++ b/tools/assistant/helpdialogimpl.h
@@ -45,7 +45,7 @@
 #include <tqstringlist.h>
 #include <ntqvalidator.h>
 #include <tqpopupmenu.h>
-#include <ntqdict.h>
+#include <tqdict.h>
 #include <tqpopupmenu.h>
 
 class TQProgressBar;
diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp
index 1346423fa..02c986a1c 100644
--- a/tools/assistant/index.cpp
+++ b/tools/assistant/index.cpp
@@ -36,7 +36,7 @@
 #include <ntqfile.h>
 #include <ntqdir.h>
 #include <tqstringlist.h>
-#include <ntqdict.h>
+#include <tqdict.h>
 #include <ntqapplication.h>
 
 #include <ctype.h>
diff --git a/tools/assistant/index.h b/tools/assistant/index.h
index 04669deac..448dd6cc6 100644
--- a/tools/assistant/index.h
+++ b/tools/assistant/index.h
@@ -35,7 +35,7 @@
 #define INDEX_H
 
 #include <tqstringlist.h>
-#include <ntqdict.h>
+#include <tqdict.h>
 #include <ntqdatastream.h>
 #include <tqobject.h>
 
diff --git a/tools/assistant/profile.cpp b/tools/assistant/profile.cpp
index 37cf3576f..8f18733ab 100644
--- a/tools/assistant/profile.cpp
+++ b/tools/assistant/profile.cpp
@@ -34,7 +34,7 @@
 #include <tqxml.h>
 #include <tqtextcodec.h>
 #include <ntqfileinfo.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <ntqdir.h>
 
 #define QT_TITLE "TQt Reference Documentation"
diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp
index f7f770161..153dd0e63 100644
--- a/tools/designer/designer/actiondnd.cpp
+++ b/tools/designer/designer/actiondnd.cpp
@@ -42,7 +42,7 @@
 
 #include <tqaction.h>
 #include <ntqapplication.h>
-#include <ntqbitmap.h>
+#include <tqbitmap.h>
 #include <tqdragobject.h>
 #include <ntqinputdialog.h>
 #include <ntqlayout.h>
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index e20958f44..185e9d2e6 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -73,7 +73,7 @@
 #include <ntqfeatures.h>
 #include <ntqaccel.h>
 #include <ntqpixmapcache.h>
-#include <ntqbitmap.h>
+#include <tqbitmap.h>
 #include <ntqsplitter.h>
 
 // FormWindow should be able to work to some limited degree
diff --git a/tools/designer/designer/layout.cpp b/tools/designer/designer/layout.cpp
index 33ff5778d..da5013067 100644
--- a/tools/designer/designer/layout.cpp
+++ b/tools/designer/designer/layout.cpp
@@ -40,7 +40,7 @@
 #include <ntqevent.h>
 #include <ntqpainter.h>
 #include <ntqpen.h>
-#include <ntqbitmap.h>
+#include <tqbitmap.h>
 #include <ntqsplitter.h>
 #include <tqvaluevector.h>
 #include <tqmainwindow.h>
diff --git a/tools/designer/designer/menubareditor.cpp b/tools/designer/designer/menubareditor.cpp
index 62aa21611..b9f70f512 100644
--- a/tools/designer/designer/menubareditor.cpp
+++ b/tools/designer/designer/menubareditor.cpp
@@ -33,7 +33,7 @@
 
 #include <tqaction.h>
 #include <ntqapplication.h>
-#include <ntqbitmap.h>
+#include <tqbitmap.h>
 #include <tqdragobject.h>
 #include <ntqlineedit.h>
 #include <tqmainwindow.h>
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index bd19799a5..edab8df30 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -50,7 +50,7 @@
 #include <ntqmetaobject.h>
 #include <tqwidgetlist.h>
 #include <tqmainwindow.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <private/qpluginmanager_p.h>
 #include <tqdatetime.h>
 #include <ntqfile.h>
diff --git a/tools/designer/designer/orderindicator.cpp b/tools/designer/designer/orderindicator.cpp
index 7a886991e..6baf60a71 100644
--- a/tools/designer/designer/orderindicator.cpp
+++ b/tools/designer/designer/orderindicator.cpp
@@ -37,7 +37,7 @@
 #include "formwindow.h"
 
 #include <ntqpainter.h>
-#include <ntqbitmap.h>
+#include <tqbitmap.h>
 #include <ntqapplication.h>
 
 OrderIndicator::OrderIndicator( int i, TQWidget* w, FormWindow *fw )
diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp
index 4a87e1a63..e238a84e8 100644
--- a/tools/designer/designer/popupmenueditor.cpp
+++ b/tools/designer/designer/popupmenueditor.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include <ntqapplication.h>
-#include <ntqcstring.h>
+#include <tqcstring.h>
 #include <ntqdatastream.h>
 #include <tqdragobject.h>
 #include <ntqlineedit.h>
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 8ae84142b..5ad88ab31 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -72,7 +72,7 @@
 #include <ntqlabel.h>
 #include <ntqlayout.h>
 #include <tqsizepolicy.h>
-#include <ntqbitmap.h>
+#include <tqbitmap.h>
 #include <tqtooltip.h>
 #include <ntqwhatsthis.h>
 #include <ntqaccel.h>
diff --git a/tools/designer/designer/sizehandle.h b/tools/designer/designer/sizehandle.h
index 8760afc71..39fc6d053 100644
--- a/tools/designer/designer/sizehandle.h
+++ b/tools/designer/designer/sizehandle.h
@@ -35,7 +35,7 @@
 #define SIZEHANDLE_H
 
 #include <tqwidget.h>
-#include <ntqintdict.h>
+#include <tqintdict.h>
 #include <tqptrdict.h>
 
 class TQMouseEvent;
diff --git a/tools/designer/designer/sourceeditor.cpp b/tools/designer/designer/sourceeditor.cpp
index 06ec283b7..e876be9ab 100644
--- a/tools/designer/designer/sourceeditor.cpp
+++ b/tools/designer/designer/sourceeditor.cpp
@@ -38,7 +38,7 @@
 #include "project.h"
 #include "mainwindow.h"
 #include "../interfaces/languageinterface.h"
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include "project.h"
 #include "sourcefile.h"
 #include "hierarchyview.h"
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index c676b0915..23d409f91 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -37,7 +37,7 @@
 #include <ntqvariant.h>
 #include <tqiconset.h>
 #include <tqstring.h>
-#include <ntqintdict.h>
+#include <tqintdict.h>
 #include <ntqtabwidget.h>
 #include <ntqpixmap.h>
 #include <tqsize.h>
diff --git a/tools/designer/editor/cindent.cpp b/tools/designer/editor/cindent.cpp
index d30be4600..ef4f74820 100644
--- a/tools/designer/editor/cindent.cpp
+++ b/tools/designer/editor/cindent.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "cindent.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 
 extern int indentForBottomLine( const TQStringList& program, TQChar typedIn );
 extern void setTabSize( int s );
diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp
index 48b6b3b65..1eee65d64 100644
--- a/tools/designer/editor/completion.cpp
+++ b/tools/designer/editor/completion.cpp
@@ -39,7 +39,7 @@
 #include <tqmap.h>
 #include <private/qrichtext_p.h>
 #include <ntqapplication.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include "arghintwidget.h"
 #include <tqsizegrip.h>
 #include <tqtimer.h>
diff --git a/tools/designer/editor/yyindent.cpp b/tools/designer/editor/yyindent.cpp
index 4851c572a..7b43cb7f2 100644
--- a/tools/designer/editor/yyindent.cpp
+++ b/tools/designer/editor/yyindent.cpp
@@ -70,7 +70,7 @@
   string literals are removed beforehand.
 */
 
-#include <ntqregexp.h>
+#include <tqregexp.h>
 
 /* qmake ignore TQ_OBJECT */
 
diff --git a/tools/designer/examples/colortool/mainform.ui b/tools/designer/examples/colortool/mainform.ui
index d3cf14c2f..b4a4f4ed9 100644
--- a/tools/designer/examples/colortool/mainform.ui
+++ b/tools/designer/examples/colortool/mainform.ui
@@ -517,7 +517,7 @@
     <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">ntqregexp.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">ntqapplication.h</include>
diff --git a/tools/designer/interfaces/preferenceinterface.h b/tools/designer/interfaces/preferenceinterface.h
index 24c631881..222a054ec 100644
--- a/tools/designer/interfaces/preferenceinterface.h
+++ b/tools/designer/interfaces/preferenceinterface.h
@@ -49,7 +49,7 @@
 
 #include <private/qcom_p.h>
 #include <tqwidgetlist.h>
-#include <ntqcstring.h>
+#include <tqcstring.h>
 
 // {5c168ee7-4bee-469f-9995-6afdb04ce5a2}
 #ifndef IID_Preference
diff --git a/tools/designer/interfaces/projectsettingsiface.h b/tools/designer/interfaces/projectsettingsiface.h
index d3b10181d..c6f6a2c22 100644
--- a/tools/designer/interfaces/projectsettingsiface.h
+++ b/tools/designer/interfaces/projectsettingsiface.h
@@ -49,7 +49,7 @@
 
 #include <private/qcom_p.h>
 #include <tqwidgetlist.h>
-#include <ntqcstring.h>
+#include <tqcstring.h>
 
 // {d332785d-17fb-4894-84fe-50dbd0ad9512}
 #ifndef IID_ProjectSettings
diff --git a/tools/designer/plugins/cppeditor/cppcompletion.cpp b/tools/designer/plugins/cppeditor/cppcompletion.cpp
index ede83151c..4f4cd52ea 100644
--- a/tools/designer/plugins/cppeditor/cppcompletion.cpp
+++ b/tools/designer/plugins/cppeditor/cppcompletion.cpp
@@ -36,7 +36,7 @@
 #include <tqobject.h>
 #include <ntqmetaobject.h>
 #include <tqobjectlist.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 
 CppEditorCompletion::CppEditorCompletion( Editor *e )
     : EditorCompletion( e )
diff --git a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
index d5dbc2bc5..36a116768 100644
--- a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
+++ b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
@@ -38,7 +38,7 @@
 #include "tqstringlist.h"
 #include "tqmap.h"
 #include "ntqapplication.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 
 const char * const SyntaxHighlighter_CPP::keywords[] = {
     // C++ keywords
diff --git a/tools/designer/plugins/cppeditor/yyreg.cpp b/tools/designer/plugins/cppeditor/yyreg.cpp
index 1f06a02e7..1c93db0a9 100644
--- a/tools/designer/plugins/cppeditor/yyreg.cpp
+++ b/tools/designer/plugins/cppeditor/yyreg.cpp
@@ -32,7 +32,7 @@
 **
 **********************************************************************/
 
-#include <ntqregexp.h>
+#include <tqregexp.h>
 
 #include <ctype.h>
 #include <stdio.h>
@@ -48,7 +48,7 @@
   you might want to read other simpler parsers written in the same
   style:
 
-	$(TQTDIR)/src/tools/qregexp.cpp
+	$(TQTDIR)/src/tools/tqregexp.cpp
 	$(TQTDIR)/tools/inspector/cppparser.cpp
   
   You might also want to read Section 2 in the Dragon Book.
diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp
index bb18507c5..1babf6814 100644
--- a/tools/designer/plugins/dlg/dlg2ui.cpp
+++ b/tools/designer/plugins/dlg/dlg2ui.cpp
@@ -38,7 +38,7 @@
 #include <ntqfile.h>
 #include <ntqframe.h>
 #include <ntqmessagebox.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <tqtextstream.h>
 
 /*
@@ -870,7 +870,7 @@ bool Dlg2Ui::checkTagName( const TQDomElement& e, const TQString& tagName )
 TQString Dlg2Ui::normalizeType( const TQString& type )
 {
     TQString t = type;
-    if ( t.isEmpty() || t == TQString("enum") || t == TQString( "qcstring" ) ||
+    if ( t.isEmpty() || t == TQString("enum") || t == TQString( "tqcstring" ) ||
 	 t == TQString("set") )
 	t = TQString( "tqstring" );
     return t;
@@ -894,7 +894,7 @@ TQVariant Dlg2Ui::getValue( const TQDomElement& e, const TQString& tagName,
 	return TQVariant( isTrue(getTextValue(e)) );
     } else if ( type == TQString("double") ) {
 	return getTextValue( e ).toDouble();
-    } else if ( type == TQString("qcstring") ) {
+    } else if ( type == TQString("tqcstring") ) {
 	return getTextValue( e ).latin1();
     } else if ( type == TQString("enum") || type == TQString("tqstring") ||
 		type == TQString("set") ) {
diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp
index d9de3f14f..7fee77e0b 100644
--- a/tools/designer/plugins/glade/glade2ui.cpp
+++ b/tools/designer/plugins/glade/glade2ui.cpp
@@ -42,7 +42,7 @@
 #include <ntqprogressdialog.h>
 #include <ntqmessagebox.h>
 #include <ntqrect.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <tqsizepolicy.h>
 
 #include <ctype.h>
diff --git a/tools/designer/plugins/wizards/mainwindowwizard.ui b/tools/designer/plugins/wizards/mainwindowwizard.ui
index 5f0fb9eb8..3406b4ca6 100644
--- a/tools/designer/plugins/wizards/mainwindowwizard.ui
+++ b/tools/designer/plugins/wizards/mainwindowwizard.ui
@@ -36,7 +36,7 @@
 <include location="global" impldecl="in implementation">tqiconset.h</include>
 <include location="global" impldecl="in implementation">tqaction.h</include>
 <include location="global" impldecl="in implementation">ntqpixmap.h</include>
-<include location="global" impldecl="in implementation">ntqdict.h</include>
+<include location="global" impldecl="in implementation">tqdict.h</include>
 <include location="local" implDecl="in declaration">mainwindowwizard.ui.h</include>
 <forward>struct DesignerFormWindow;</forward>
 <forward>struct DesignerInterface;</forward>
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index 4c17cc823..f9ebb15b2 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -41,7 +41,7 @@
 #include <ntqlabel.h>
 #include <ntqgroupbox.h>
 #include <ntqlayout.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <ntqpushbutton.h>
 #include <ntqmultilineedit.h>
 #include <ntqlistview.h>
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index 5648f5631..ac5fbe6b9 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -38,7 +38,7 @@
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 #include <tqstrlist.h>
-#include <ntqdict.h>
+#include <tqdict.h>
 #include <ntqfile.h>
 #include <tqtextstream.h>
 #include <ntqcleanuphandler.h>
diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index cbdc7e828..4cb531409 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -137,7 +137,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
     out << "\n";
 
     out << "#include <tqimage.h>\n";
-    out << "#include <ntqdict.h>\n";
+    out << "#include <tqdict.h>\n";
     out << "#include <tqmime.h>\n";
     out << "#include <tqdragobject.h>\n";
     out << "\n";
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index 5a24be097..7dbd4be3a 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -40,7 +40,7 @@
 #include <ntqfile.h>
 #include <ntqfileinfo.h>
 #include <ntqdir.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 
diff --git a/tools/designer/uic/object.cpp b/tools/designer/uic/object.cpp
index fbd052c0f..cd3cfbe8a 100644
--- a/tools/designer/uic/object.cpp
+++ b/tools/designer/uic/object.cpp
@@ -34,7 +34,7 @@
 #include "uic.h"
 #include "parser.h"
 #include "domtool.h"
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <tqsizepolicy.h>
 #include <tqstringlist.h>
 #define NO_STATIC_COLORS
diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp
index 97794b0c6..8f15973f2 100644
--- a/tools/designer/uic/subclassing.cpp
+++ b/tools/designer/uic/subclassing.cpp
@@ -40,7 +40,7 @@
 #include <tqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tools/designer/uic/uic.cpp b/tools/designer/uic/uic.cpp
index 4566b031f..36db825b8 100644
--- a/tools/designer/uic/uic.cpp
+++ b/tools/designer/uic/uic.cpp
@@ -40,7 +40,7 @@
 #include <tqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tools/linguist/linguist/listviews.h b/tools/linguist/linguist/listviews.h
index 1deae883b..877960114 100644
--- a/tools/linguist/linguist/listviews.h
+++ b/tools/linguist/linguist/listviews.h
@@ -38,7 +38,7 @@
 
 #include <tqstring.h>
 #include <tqptrlist.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <ntqlistview.h>
 
 class LVI : public TQListViewItem
diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp
index cd12369f7..0330584b4 100644
--- a/tools/linguist/linguist/msgedit.cpp
+++ b/tools/linguist/linguist/msgedit.cpp
@@ -56,7 +56,7 @@
 #include <ntqvbox.h>
 #include <tqmainwindow.h>
 #include <ntqheader.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <ntqdockarea.h>
 #include <ntqdockwindow.h>
 #include <ntqscrollview.h>
diff --git a/tools/linguist/linguist/msgedit.h b/tools/linguist/linguist/msgedit.h
index a64440efa..2bcd99ed3 100644
--- a/tools/linguist/linguist/msgedit.h
+++ b/tools/linguist/linguist/msgedit.h
@@ -45,7 +45,7 @@
 #include <tqvaluelist.h>
 #include <ntqscrollview.h>
 #include <ntqpixmap.h>
-#include <ntqbitmap.h>
+#include <tqbitmap.h>
 #include <tqtooltip.h>
 
 class TQAccel;
diff --git a/tools/linguist/linguist/phrase.cpp b/tools/linguist/linguist/phrase.cpp
index de63b643a..d529adc0f 100644
--- a/tools/linguist/linguist/phrase.cpp
+++ b/tools/linguist/linguist/phrase.cpp
@@ -34,10 +34,10 @@
 #include "phrase.h"
 
 #include <ntqapplication.h>
-#include <ntqcstring.h>
+#include <tqcstring.h>
 #include <ntqfile.h>
 #include <ntqmessagebox.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <tqtextstream.h>
 #include <tqxml.h>
 
diff --git a/tools/linguist/linguist/phraselv.cpp b/tools/linguist/linguist/phraselv.cpp
index 92757cd84..62e1d1180 100644
--- a/tools/linguist/linguist/phraselv.cpp
+++ b/tools/linguist/linguist/phraselv.cpp
@@ -39,7 +39,7 @@
 
 #include "phraselv.h"
 
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <ntqwhatsthis.h>
 #include <ntqheader.h>
 
diff --git a/tools/linguist/linguist/simtexth.cpp b/tools/linguist/linguist/simtexth.cpp
index a48ddb6aa..9d78cf72b 100644
--- a/tools/linguist/linguist/simtexth.cpp
+++ b/tools/linguist/linguist/simtexth.cpp
@@ -35,8 +35,8 @@
 
 #include <metatranslator.h>
 
-#include <ntqcstring.h>
-#include <ntqdict.h>
+#include <tqcstring.h>
+#include <tqdict.h>
 #include <tqmap.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp
index 8ff22afe7..a605858b6 100644
--- a/tools/linguist/linguist/trwindow.cpp
+++ b/tools/linguist/linguist/trwindow.cpp
@@ -49,8 +49,8 @@
 #include <ntqaccel.h>
 #include <tqaction.h>
 #include <ntqapplication.h>
-#include <ntqbitmap.h>
-#include <ntqdict.h>
+#include <tqbitmap.h>
+#include <tqdict.h>
 #include <ntqdockarea.h>
 #include <ntqdockwindow.h>
 #include <ntqfile.h>
@@ -62,7 +62,7 @@
 #include <tqmenubar.h>
 #include <ntqmessagebox.h>
 #include <tqpopupmenu.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <ntqsettings.h>
 #include <tqstatusbar.h>
 #include <tqtoolbar.h>
diff --git a/tools/linguist/linguist/trwindow.h b/tools/linguist/linguist/trwindow.h
index 89a4edb28..5c0dfaaec 100644
--- a/tools/linguist/linguist/trwindow.h
+++ b/tools/linguist/linguist/trwindow.h
@@ -40,7 +40,7 @@
 
 #include <tqmainwindow.h>
 #include <tqptrlist.h>
-#include <ntqdict.h>
+#include <tqdict.h>
 #include <ntqprinter.h>
 #include <tqstringlist.h>
 #include <ntqpixmap.h>
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index a20bd5cc5..fb0f03cfa 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -37,7 +37,7 @@
 #include <ntqdir.h>
 #include <ntqfile.h>
 #include <ntqfileinfo.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqtextstream.h>
diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp
index 3295dbaf2..852dda994 100644
--- a/tools/linguist/lupdate/fetchtr.cpp
+++ b/tools/linguist/lupdate/fetchtr.cpp
@@ -34,7 +34,7 @@
 #include <metatranslator.h>
 
 #include <ntqfile.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <tqstring.h>
 #include <tqtextstream.h>
 #include <tqvaluestack.h>
diff --git a/tools/linguist/lupdate/numberh.cpp b/tools/linguist/lupdate/numberh.cpp
index 919859b6c..cc160140e 100644
--- a/tools/linguist/lupdate/numberh.cpp
+++ b/tools/linguist/lupdate/numberh.cpp
@@ -33,8 +33,8 @@
 
 #include <metatranslator.h>
 
-#include <ntqmemarray.h>
-#include <ntqcstring.h>
+#include <tqmemarray.h>
+#include <tqcstring.h>
 #include <tqmap.h>
 #include <tqstringlist.h>
 
diff --git a/tools/linguist/lupdate/sametexth.cpp b/tools/linguist/lupdate/sametexth.cpp
index 9ade0764c..46799179c 100644
--- a/tools/linguist/lupdate/sametexth.cpp
+++ b/tools/linguist/lupdate/sametexth.cpp
@@ -33,7 +33,7 @@
 
 #include <metatranslator.h>
 
-#include <ntqcstring.h>
+#include <tqcstring.h>
 #include <tqmap.h>
 
 typedef TQMap<TQCString, MetaTranslatorMessage> TMM;
diff --git a/tools/linguist/shared/metatranslator.cpp b/tools/linguist/shared/metatranslator.cpp
index aabd5d28e..1d08cb41b 100644
--- a/tools/linguist/shared/metatranslator.cpp
+++ b/tools/linguist/shared/metatranslator.cpp
@@ -34,7 +34,7 @@
 #include "metatranslator.h"
 
 #include <ntqapplication.h>
-#include <ntqcstring.h>
+#include <tqcstring.h>
 #include <ntqfile.h>
 #include <ntqmessagebox.h>
 #include <tqtextcodec.h>
diff --git a/tools/linguist/shared/proparser.cpp b/tools/linguist/shared/proparser.cpp
index f4a6d8deb..d53464040 100644
--- a/tools/linguist/shared/proparser.cpp
+++ b/tools/linguist/shared/proparser.cpp
@@ -36,7 +36,7 @@
 #include <ntqdir.h>
 #include <ntqfile.h>
 #include <ntqfileinfo.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <tqstringlist.h>
 #include <tqtextstream.h>
 
diff --git a/tools/linguist/tqm2ts/main.cpp b/tools/linguist/tqm2ts/main.cpp
index 8d50a346e..fe5feebc0 100644
--- a/tools/linguist/tqm2ts/main.cpp
+++ b/tools/linguist/tqm2ts/main.cpp
@@ -33,7 +33,7 @@
 
 #include <metatranslator.h>
 
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #include <tqstring.h>
 #include <ntqtranslator.h>
 
diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp
index e907f3229..8700652b9 100644
--- a/tools/qconfig/main.cpp
+++ b/tools/qconfig/main.cpp
@@ -44,7 +44,7 @@
 #include <tqtoolbutton.h>
 #include <tqstatusbar.h>
 #include <ntqsplitter.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
 #if defined(Q_OS_WIN32)
 #include <direct.h>
 #else
diff --git a/tools/qembed/qembed.cpp b/tools/qembed/qembed.cpp
index d8fa46cde..112ecb7c7 100644
--- a/tools/qembed/qembed.cpp
+++ b/tools/qembed/qembed.cpp
@@ -23,7 +23,7 @@
 #include <tqtextstream.h>
 #include <tqdatetime.h>
 #include <tqimage.h>
-#include <ntqdict.h>
+#include <tqdict.h>
 #include <ntqdir.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -97,7 +97,7 @@ int main( int argc, char **argv )
 	if ( arg == "--images" ) {
 	    if ( !images ) {
 		out << "#include <tqimage.h>\n";
-		out << "#include <ntqdict.h>\n";
+		out << "#include <tqdict.h>\n";
 		images = TRUE;
 	    }
 	} else {
@@ -171,9 +171,9 @@ int main( int argc, char **argv )
     }
 
     if ( list.count() > 0 ) {
-	out << "#include <ntqcstring.h>\n";
+	out << "#include <tqcstring.h>\n";
 	if ( !images )
-	    out << "#include <ntqdict.h>\n";
+	    out << "#include <tqdict.h>\n";
 
 	out << "static struct Embed {\n"
 	       "    unsigned int size;\n"