Rename str nt* related files to equivalent tq*

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

80 files changed, 108 insertions, 108 deletions

diff --git a/tools/assistant/config.h b/tools/assistant/config.h
index 8d4f0ecaa..7caef30fd 100644
--- a/tools/assistant/config.h
+++ b/tools/assistant/config.h
@@ -36,8 +36,8 @@
 
 #include "profile.h"
 
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <ntqpixmap.h>
 #include <tqmap.h>
 
diff --git a/tools/assistant/docuparser.cpp b/tools/assistant/docuparser.cpp
index f288e4320..e0e3609d0 100644
--- a/tools/assistant/docuparser.cpp
+++ b/tools/assistant/docuparser.cpp
@@ -38,7 +38,7 @@
 #include <ntqfile.h>
 #include <ntqfileinfo.h>
 #include <ntqregexp.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <tqxml.h>
 
 TQDataStream &operator>>( TQDataStream &s, ContentItem &ci )
diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h
index 1c0585fb5..c980ac493 100644
--- a/tools/assistant/helpdialogimpl.h
+++ b/tools/assistant/helpdialogimpl.h
@@ -42,7 +42,7 @@
 #include <ntqlistbox.h>
 #include <ntqlistview.h>
 #include <tqmap.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ntqvalidator.h>
 #include <ntqpopupmenu.h>
 #include <ntqdict.h>
diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp
index c5d142208..1346423fa 100644
--- a/tools/assistant/index.cpp
+++ b/tools/assistant/index.cpp
@@ -35,7 +35,7 @@
 
 #include <ntqfile.h>
 #include <ntqdir.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ntqdict.h>
 #include <ntqapplication.h>
 
diff --git a/tools/assistant/index.h b/tools/assistant/index.h
index 4e96b8de9..04669deac 100644
--- a/tools/assistant/index.h
+++ b/tools/assistant/index.h
@@ -34,7 +34,7 @@
 #ifndef INDEX_H
 #define INDEX_H
 
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ntqdict.h>
 #include <ntqdatastream.h>
 #include <tqobject.h>
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index 85d2ade0e..22bcedd66 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -40,7 +40,7 @@
 #include <ntqsocket.h>
 #include <ntqpixmap.h>
 #include <tqptrlist.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ntqdir.h>
 #include <ntqmessagebox.h>
 #include <ntqguardedptr.h>
diff --git a/tools/assistant/mainwindow.ui b/tools/assistant/mainwindow.ui
index bd353eaab..bb06b0044 100644
--- a/tools/assistant/mainwindow.ui
+++ b/tools/assistant/mainwindow.ui
@@ -600,7 +600,7 @@
     <include location="global" impldecl="in declaration">ntqguardedptr.h</include>
     <include location="global" impldecl="in declaration">tqmap.h</include>
     <include location="local" impldecl="in declaration">finddialog.h</include>
-    <include location="global" impldecl="in declaration">ntqstringlist.h</include>
+    <include location="global" impldecl="in declaration">tqstringlist.h</include>
     <include location="local" impldecl="in declaration">helpwindow.h</include>
     <include location="local" impldecl="in implementation">mainwindow.ui.h</include>
 </includes>
diff --git a/tools/assistant/profile.h b/tools/assistant/profile.h
index 9514fbe1c..d3732605b 100644
--- a/tools/assistant/profile.h
+++ b/tools/assistant/profile.h
@@ -35,8 +35,8 @@
 #define PROFILE_H
 
 #include <ntqfileinfo.h>
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <tqmap.h>
 
 class DocuParser;
diff --git a/tools/assistant/settingsdialogimpl.h b/tools/assistant/settingsdialogimpl.h
index 24f105d27..18377e89f 100644
--- a/tools/assistant/settingsdialogimpl.h
+++ b/tools/assistant/settingsdialogimpl.h
@@ -36,7 +36,7 @@
 
 #include "settingsdialog.h"
 
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <tqptrlist.h>
 #include <ntqlistview.h>
 
diff --git a/tools/assistant/topicchooserimpl.h b/tools/assistant/topicchooserimpl.h
index 11216fa0a..8b3af6d5a 100644
--- a/tools/assistant/topicchooserimpl.h
+++ b/tools/assistant/topicchooserimpl.h
@@ -36,7 +36,7 @@
 
 #include "topicchooser.h"
 
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 
 class TopicChooser : public TopicChooserBase
 {
diff --git a/tools/designer/designer/asciivalidator.cpp b/tools/designer/designer/asciivalidator.cpp
index 640cd1eb8..b8126cf22 100644
--- a/tools/designer/designer/asciivalidator.cpp
+++ b/tools/designer/designer/asciivalidator.cpp
@@ -33,7 +33,7 @@
 
 #include "asciivalidator.h"
 
-#include <ntqstring.h>
+#include <tqstring.h>
 
 AsciiValidator::AsciiValidator( TQObject * parent, const char *name )
     : TQValidator( parent, name ), functionName( FALSE )
diff --git a/tools/designer/designer/command.h b/tools/designer/designer/command.h
index 74f5ec881..88a25956c 100644
--- a/tools/designer/designer/command.h
+++ b/tools/designer/designer/command.h
@@ -37,7 +37,7 @@
 #include "metadatabase.h"
 #include "layout.h"
 
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqrect.h>
 #include <tqvaluelist.h>
 #include <ntqvariant.h>
diff --git a/tools/designer/designer/database.h b/tools/designer/designer/database.h
index bfb7e1e7b..0ab766e39 100644
--- a/tools/designer/designer/database.h
+++ b/tools/designer/designer/database.h
@@ -40,7 +40,7 @@
 #include <tqdataview.h>
 #include <tqdatabrowser.h>
 #include <tqsqlcursor.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 
 class TQSqlDatabase;
 class TQSqlForm;
diff --git a/tools/designer/designer/database2.h b/tools/designer/designer/database2.h
index 4bd1215ed..3126d5991 100644
--- a/tools/designer/designer/database2.h
+++ b/tools/designer/designer/database2.h
@@ -40,7 +40,7 @@
 #include <tqdataview.h>
 #include <tqdatabrowser.h>
 #include <tqsqlcursor.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 
 class TQSqlDatabase;
 class TQSqlForm;
diff --git a/tools/designer/designer/defs.h b/tools/designer/designer/defs.h
index 1a6bf5cb9..bcb93727c 100644
--- a/tools/designer/designer/defs.h
+++ b/tools/designer/designer/defs.h
@@ -35,7 +35,7 @@
 #define DEFS_H
 
 #include <ntqsizepolicy.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 
 #define POINTER_TOOL 32000
 #define CONNECT_TOOL 32001
diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h
index 6403b2b5a..1b59b2ebd 100644
--- a/tools/designer/designer/designer_pch.h
+++ b/tools/designer/designer/designer_pch.h
@@ -28,7 +28,7 @@
 #include <ntqpixmap.h>
 #include <ntqpushbutton.h>
 #include <ntqspinbox.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqtooltip.h>
 #include <ntqvariant.h>
 #include <ntqwhatsthis.h>
diff --git a/tools/designer/designer/editfunctionsimpl.cpp b/tools/designer/designer/editfunctionsimpl.cpp
index dc2f625e0..437dec8c2 100644
--- a/tools/designer/designer/editfunctionsimpl.cpp
+++ b/tools/designer/designer/editfunctionsimpl.cpp
@@ -43,7 +43,7 @@
 #include <ntqpushbutton.h>
 #include <ntqlineedit.h>
 #include <ntqcombobox.h>
-#include <ntqstrlist.h>
+#include <tqstrlist.h>
 #include <ntqmessagebox.h>
 #include <ntqlayout.h>
 #include <ntqlabel.h>
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index e533d350f..9203f7f80 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -46,7 +46,7 @@
 #include <ntqlayout.h>
 #include <tqptrdict.h>
 #include <tqobjectlist.h>
-#include <ntqstrlist.h>
+#include <tqstrlist.h>
 #include <ntqmetaobject.h>
 #include <tqwidgetlist.h>
 #include <ntqmainwindow.h>
diff --git a/tools/designer/designer/metadatabase.h b/tools/designer/designer/metadatabase.h
index 9e5165042..ab7a682ea 100644
--- a/tools/designer/designer/metadatabase.h
+++ b/tools/designer/designer/metadatabase.h
@@ -35,8 +35,8 @@
 #define METADATABASE_H
 
 #include <ntqvariant.h>
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <tqmap.h>
 #include <tqptrlist.h>
 #include <ntqsizepolicy.h>
diff --git a/tools/designer/designer/outputwindow.h b/tools/designer/designer/outputwindow.h
index 335d84f68..7625a43cd 100644
--- a/tools/designer/designer/outputwindow.h
+++ b/tools/designer/designer/outputwindow.h
@@ -35,7 +35,7 @@
 #define OUTPUTWINDOW_H
 
 #include <ntqtabwidget.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <tqvaluelist.h>
 #include <ntqlistview.h>
 
diff --git a/tools/designer/designer/pixmapcollection.h b/tools/designer/designer/pixmapcollection.h
index 07376a191..918f18d4c 100644
--- a/tools/designer/designer/pixmapcollection.h
+++ b/tools/designer/designer/pixmapcollection.h
@@ -34,7 +34,7 @@
 #ifndef PIXMAPCOLLECTION_H
 #define PIXMAPCOLLECTION_H
 
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqpixmap.h>
 #include <tqvaluelist.h>
 #include "designerappiface.h"
diff --git a/tools/designer/designer/project.h b/tools/designer/designer/project.h
index e39a82561..a5aa95b04 100644
--- a/tools/designer/designer/project.h
+++ b/tools/designer/designer/project.h
@@ -36,8 +36,8 @@
 
 #include <ntqfeatures.h>
 
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <tqptrlist.h>
 #include <tqmap.h>
 #include <private/qpluginmanager_p.h>
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 2c414d9a3..85b2b2ec9 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -56,7 +56,7 @@
 #include <ntqapplication.h>
 #include <ntqheader.h>
 #include <ntqlineedit.h>
-#include <ntqstrlist.h>
+#include <tqstrlist.h>
 #include <ntqmetaobject.h>
 #include <ntqcombobox.h>
 #include <ntqpushbutton.h>
diff --git a/tools/designer/designer/qcompletionedit.h b/tools/designer/designer/qcompletionedit.h
index 98caedba6..2b35c2412 100644
--- a/tools/designer/designer/qcompletionedit.h
+++ b/tools/designer/designer/qcompletionedit.h
@@ -35,7 +35,7 @@
 #define TQCOMPLETIONEDIT_H
 
 #include <ntqlineedit.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 
 class TQListBox;
 class TQVBox;
diff --git a/tools/designer/designer/resource.h b/tools/designer/designer/resource.h
index b2b437d1c..a8580dae9 100644
--- a/tools/designer/designer/resource.h
+++ b/tools/designer/designer/resource.h
@@ -34,7 +34,7 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqtextstream.h>
 #include <ntqvariant.h>
 #include <tqvaluelist.h>
diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp
index e254396ff..cbf15601c 100644
--- a/tools/designer/designer/startdialogimpl.cpp
+++ b/tools/designer/designer/startdialogimpl.cpp
@@ -1,5 +1,5 @@
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <tqptrlist.h>
 #include <ntqiconview.h>
 #include <ntqcombobox.h>
diff --git a/tools/designer/designer/startdialogimpl.h b/tools/designer/designer/startdialogimpl.h
index 3d7919ca3..3480c5714 100644
--- a/tools/designer/designer/startdialogimpl.h
+++ b/tools/designer/designer/startdialogimpl.h
@@ -36,8 +36,8 @@
 
 #include <ntqiconview.h>
 #include <ntqlistview.h>
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <ntqfiledialog.h>
 #include <tqmap.h>
 
diff --git a/tools/designer/designer/syntaxhighlighter_html.cpp b/tools/designer/designer/syntaxhighlighter_html.cpp
index 48dbbe7eb..6a7946c05 100644
--- a/tools/designer/designer/syntaxhighlighter_html.cpp
+++ b/tools/designer/designer/syntaxhighlighter_html.cpp
@@ -33,7 +33,7 @@
 **********************************************************************/
 
 #include "syntaxhighlighter_html.h"
-#include "ntqstring.h"
+#include "tqstring.h"
 #include "tqmap.h"
 #include "ntqapplication.h"
 
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index 1220d81cc..be9a4849d 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -36,7 +36,7 @@
 
 #include <ntqvariant.h>
 #include <ntqiconset.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqintdict.h>
 #include <ntqtabwidget.h>
 #include <ntqpixmap.h>
diff --git a/tools/designer/editor/completion.h b/tools/designer/editor/completion.h
index 719582990..a3ab598fd 100644
--- a/tools/designer/editor/completion.h
+++ b/tools/designer/editor/completion.h
@@ -34,8 +34,8 @@
 #ifndef COMPLETION_H
 #define COMPLETION_H
 
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <tqobject.h>
 #include <tqmap.h>
 
diff --git a/tools/designer/editor/parenmatcher.h b/tools/designer/editor/parenmatcher.h
index 34318493b..2aa843bf9 100644
--- a/tools/designer/editor/parenmatcher.h
+++ b/tools/designer/editor/parenmatcher.h
@@ -34,7 +34,7 @@
 #ifndef PARENMATCHER_H
 #define PARENMATCHER_H
 
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <tqvaluelist.h>
 
 class TQTextCursor;
diff --git a/tools/designer/examples/colortool/colornameform.ui.h b/tools/designer/examples/colortool/colornameform.ui.h
index 8a138c84f..dc6515540 100644
--- a/tools/designer/examples/colortool/colornameform.ui.h
+++ b/tools/designer/examples/colortool/colornameform.ui.h
@@ -7,7 +7,7 @@
 *****************************************************************************/
 #include <ntqcolor.h>
 #include <tqmap.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 
 TQMap<TQString,TQColor> m_colors;
 
diff --git a/tools/designer/examples/colortool/mainform.ui b/tools/designer/examples/colortool/mainform.ui
index e3eba7b5e..9319ffbed 100644
--- a/tools/designer/examples/colortool/mainform.ui
+++ b/tools/designer/examples/colortool/mainform.ui
@@ -522,7 +522,7 @@
     <include location="local" impldecl="in implementation">ntqfiledialog.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">ntqstring.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">ntqstatusbar.h</include>
     <include location="local" impldecl="in implementation">ntqmessagebox.h</include>
diff --git a/tools/designer/interfaces/designerinterface.h b/tools/designer/interfaces/designerinterface.h
index aa81f68a3..982d83145 100644
--- a/tools/designer/interfaces/designerinterface.h
+++ b/tools/designer/interfaces/designerinterface.h
@@ -49,9 +49,9 @@
 
 #include <private/qcom_p.h>
 #include <tqptrlist.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <tqmap.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <tqwidgetlist.h>
 #include <tqobjectlist.h>
 
diff --git a/tools/designer/interfaces/languageinterface.h b/tools/designer/interfaces/languageinterface.h
index 2f6dcc052..58f6d5dc9 100644
--- a/tools/designer/interfaces/languageinterface.h
+++ b/tools/designer/interfaces/languageinterface.h
@@ -49,9 +49,9 @@
 
 #include <private/qcom_p.h>
 #include <tqvaluelist.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <tqmap.h>
-#include <ntqstrlist.h>
+#include <tqstrlist.h>
 
 // {f208499a-6f69-4883-9219-6e936e55a330}
 #ifndef IID_Language
diff --git a/tools/designer/interfaces/sourcetemplateiface.h b/tools/designer/interfaces/sourcetemplateiface.h
index 6ea60476c..5757f4f16 100644
--- a/tools/designer/interfaces/sourcetemplateiface.h
+++ b/tools/designer/interfaces/sourcetemplateiface.h
@@ -48,7 +48,7 @@
 //
 
 #include <private/qcom_p.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 
 // {1b3446a4-1c71-424b-8789-1f34eb5697d8}
 #ifndef IID_SourceTemplate
diff --git a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
index faa341b46..d5dbc2bc5 100644
--- a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
+++ b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
@@ -34,8 +34,8 @@
 
 #include "syntaxhighliter_cpp.h"
 #include "paragdata.h"
-#include "ntqstring.h"
-#include "ntqstringlist.h"
+#include "tqstring.h"
+#include "tqstringlist.h"
 #include "tqmap.h"
 #include "ntqapplication.h"
 #include "ntqregexp.h"
diff --git a/tools/designer/plugins/cppeditor/yyreg.h b/tools/designer/plugins/cppeditor/yyreg.h
index bb4922f21..ed6bd52c5 100644
--- a/tools/designer/plugins/cppeditor/yyreg.h
+++ b/tools/designer/plugins/cppeditor/yyreg.h
@@ -35,7 +35,7 @@
 #ifndef YYREG_H
 #define YYREG_H
 
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <tqvaluelist.h>
 
 class CppFunction
diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp
index 23e18063e..a89934659 100644
--- a/tools/designer/plugins/dlg/dlg2ui.cpp
+++ b/tools/designer/plugins/dlg/dlg2ui.cpp
@@ -78,7 +78,7 @@ static const struct {
 } propertyDefs[] = {
     { "Button", "AutoRepeat", "autoRepeat", "boolean" },
     { "Button", "AutoResize", 0, 0 },
-    { "Button", "Text", "text", "qstring" },
+    { "Button", "Text", "text", "tqstring" },
     { "ButtonGroup", "Exclusive", "exclusive", "boolean" },
     { "ButtonGroup", "RadioButtonExclusive", "radioButtonExclusive",
       "boolean" },
@@ -123,7 +123,7 @@ static const struct {
     { "Frame", "LineWidth", "lineWidth", "integer" },
     { "Frame", "MidLineWidth", "midLineWidth", "integer" },
     { "Frame", "Style", 0, 0 },
-    { "GroupBox", "Title", "title", "qstring" },
+    { "GroupBox", "Title", "title", "tqstring" },
     { "IconView", "AlignMode", 0, 0 },
     { "IconView", "Aligning", 0, 0 },
     { "IconView", "Arrangement", "arrangement", "enum" },
@@ -148,12 +148,12 @@ static const struct {
     { "LCDNumber", "Value", 0, 0 },
     { "Label", "AutoResize", 0, 0 },
     { "Label", "Indent", "indent", "integer" },
-    { "Label", "Text", "text", "qstring" },
+    { "Label", "Text", "text", "tqstring" },
     { "Label", "TextFormat", "textFormat", "enum" },
     { "LineEdit", "EchoMode", "echoMode", "enum" },
     { "LineEdit", "FrameShown", "frame", "boolean"  },
     { "LineEdit", "MaxLength", "maxLength", "integer" },
-    { "LineEdit", "Text", "text", "qstring" },
+    { "LineEdit", "Text", "text", "tqstring" },
     { "ListBox", "AutoScroll", 0, 0 },
     { "ListBox", "AutoUpdate", 0, 0 },
     { "ListBox", "ColumnMode", "columnMode", "enum" },
@@ -214,10 +214,10 @@ static const struct {
     { "SpinBox", "ButtonSymbols", "buttonSymbols", "enum" },
     { "SpinBox", "MaxValue", "maxValue", "integer" },
     { "SpinBox", "MinValue", "minValue", "integer" },
-    { "SpinBox", "Prefix", "prefix", "qstring" },
-    { "SpinBox", "SpecialValue", "specialValueText", "qstring" },
+    { "SpinBox", "Prefix", "prefix", "tqstring" },
+    { "SpinBox", "SpecialValue", "specialValueText", "tqstring" },
     { "SpinBox", "Step", "lineStep", "integer" },
-    { "SpinBox", "Suffix", "suffix", "qstring" },
+    { "SpinBox", "Suffix", "suffix", "tqstring" },
     { "SpinBox", "Wrapping", "wrapping", "boolean" },
     { "Splitter", "OpaqueResize", 0, 0 },
     { "Splitter", "Orientation", "orientation", "enum" },
@@ -225,7 +225,7 @@ static const struct {
     { "TabBar", "TabNames", 0, 0 },
     { "TextView", "Context", 0, 0 },
     { "TextView", "LinkUnderline", "linkUnderline", "boolean" },
-    { "TextView", "Text", "text", "qstring" },
+    { "TextView", "Text", "text", "tqstring" },
     { "TextView", "TextFormat", "textFormat", "enum" },
     { "User", "UserClassHeader", 0, 0 },
     { "User", "UserClassName", 0, 0 },
@@ -824,7 +824,7 @@ void Dlg2Ui::emitWidgetBody( const TQDomElement& e, bool layouted )
 		    TQString type( propertyDefs[*p].type );
 		    TQVariant val = getValue( n.toElement(), tagName, type );
 
-		    if ( type == TQString("qstring") )
+		    if ( type == TQString("tqstring") )
 			type = TQString( "string" );
 
 		    bool omit = FALSE;
@@ -872,7 +872,7 @@ TQString Dlg2Ui::normalizeType( const TQString& type )
     TQString t = type;
     if ( t.isEmpty() || t == TQString("enum") || t == TQString( "qcstring" ) ||
 	 t == TQString("set") )
-	t = TQString( "qstring" );
+	t = TQString( "tqstring" );
     return t;
 }
 
@@ -896,7 +896,7 @@ TQVariant Dlg2Ui::getValue( const TQDomElement& e, const TQString& tagName,
 	return getTextValue( e ).toDouble();
     } else if ( type == TQString("qcstring") ) {
 	return getTextValue( e ).latin1();
-    } else if ( type == TQString("enum") || type == TQString("qstring") ||
+    } else if ( type == TQString("enum") || type == TQString("tqstring") ||
 		type == TQString("set") ) {
 	return getTextValue( e );
     } else {
@@ -937,7 +937,7 @@ TQVariant Dlg2Ui::getValue( const TQDomElement& e, const TQString& tagName,
 	    return TQPalette( active, disabled, inactive );
 	} else if ( type == TQString("qfont") ) {
 	    TQString family = getValue( children, TQString("Family"),
-				       TQString("qstring") ).toString();
+				       TQString("tqstring") ).toString();
 	    int pointSize = getValue( children, TQString("PointSize"),
 				      TQString("integer") ).toInt();
 	    int weight = getValue( children, TQString("weight"),
diff --git a/tools/designer/plugins/dlg/dlg2ui.h b/tools/designer/plugins/dlg/dlg2ui.h
index 15b5377e8..d500aab56 100644
--- a/tools/designer/plugins/dlg/dlg2ui.h
+++ b/tools/designer/plugins/dlg/dlg2ui.h
@@ -37,7 +37,7 @@
 
 #include <tqdom.h>
 #include <tqmap.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqvariant.h>
 
 typedef TQMap<TQString, TQString> AttributeMap;
@@ -69,7 +69,7 @@ private:
     void syntaxError();
     TQString getTextValue( const TQDomNode& node );
     TQVariant getValue( const TQDomNodeList& children, const TQString& tagName,
-		       const TQString& type = "qstring" );
+		       const TQString& type = "tqstring" );
     void emitHeader();
     void emitFooter();
     void emitSimpleValue( const TQString& tag, const TQString& value,
@@ -99,7 +99,7 @@ private:
     bool checkTagName( const TQDomElement& e, const TQString& tagName );
     TQString normalizeType( const TQString& type );
     TQVariant getValue( const TQDomElement& e, const TQString& tagName,
-		       const TQString& type = "qstring" );
+		       const TQString& type = "tqstring" );
     void matchDialogCommon( const TQDomElement& dialogCommon );
     bool needsTQLayoutWidget( const TQDomElement& e );
     void matchBoxLayout( const TQDomElement& boxLayout );
diff --git a/tools/designer/plugins/glade/glade2ui.h b/tools/designer/plugins/glade/glade2ui.h
index 936818226..1d28803e3 100644
--- a/tools/designer/plugins/glade/glade2ui.h
+++ b/tools/designer/plugins/glade/glade2ui.h
@@ -37,7 +37,7 @@
 
 #include <tqdom.h>
 #include <tqmap.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqvariant.h>
 
 typedef TQMap<TQString, TQString> AttributeMap;
diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
index dc52d1e47..ccd7a31c9 100644
--- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
+++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
@@ -34,7 +34,7 @@
 
 #include "kdevdlg2ui.h"
 #include <ntqdir.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <tqptrstack.h>
 
 /// some little helpers ///
diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.h b/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
index 5f2b6d3bc..ff7d19552 100644
--- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
+++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
@@ -37,7 +37,7 @@
 
 #include <ntqtextstream.h>
 #include <ntqfile.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 
 class KDEVDLG2UI
 {
diff --git a/tools/designer/plugins/kdevdlg/main.cpp b/tools/designer/plugins/kdevdlg/main.cpp
index d12cd12cf..1092d3dc0 100644
--- a/tools/designer/plugins/kdevdlg/main.cpp
+++ b/tools/designer/plugins/kdevdlg/main.cpp
@@ -35,7 +35,7 @@
 #include <filterinterface.h>
 
 #include <ntqapplication.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqdir.h>
 
 #include "kdevdlg2ui.h"
diff --git a/tools/designer/plugins/rc/rc2ui.cpp b/tools/designer/plugins/rc/rc2ui.cpp
index c43bb65f6..d0d6c7af3 100644
--- a/tools/designer/plugins/rc/rc2ui.cpp
+++ b/tools/designer/plugins/rc/rc2ui.cpp
@@ -845,7 +845,7 @@ bool RC2UI::makeStringTable()
 	*out << "#ifndef STRINGTABLE_H" << endl;
 	*out << "#define STRINGTABLE_H" << endl;
 	*out << endl;
-	*out << "#include <ntqstring.h>" << endl;
+	*out << "#include <tqstring.h>" << endl;
 	*out << "#include <tqobject.h>" << endl;
 	*out << endl;
 
diff --git a/tools/designer/plugins/rc/rc2ui.h b/tools/designer/plugins/rc/rc2ui.h
index 68829211b..87a6fb98f 100644
--- a/tools/designer/plugins/rc/rc2ui.h
+++ b/tools/designer/plugins/rc/rc2ui.h
@@ -37,7 +37,7 @@
 
 #include <ntqtextstream.h>
 #include <ntqfile.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 
 class RC2UI
 {
diff --git a/tools/designer/shared/parser.cpp b/tools/designer/shared/parser.cpp
index d001d8bdb..f835df713 100644
--- a/tools/designer/shared/parser.cpp
+++ b/tools/designer/shared/parser.cpp
@@ -33,7 +33,7 @@
 
 #include "parser.h"
 #include <tqobject.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 
 class NormalizeObject : public TQObject
 {
diff --git a/tools/designer/shared/parser.h b/tools/designer/shared/parser.h
index 01a253566..75e7e322c 100644
--- a/tools/designer/shared/parser.h
+++ b/tools/designer/shared/parser.h
@@ -34,7 +34,7 @@
 #ifndef PARSER_H
 #define PARSER_H
 
-#include <ntqstring.h>
+#include <tqstring.h>
 
 class Parser
 {
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index 4a753d3ef..5435526f9 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -37,7 +37,7 @@
 #include <ntqapplication.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <ntqstrlist.h>
+#include <tqstrlist.h>
 #include <ntqdict.h>
 #include <ntqfile.h>
 #include <ntqtextstream.h>
diff --git a/tools/designer/shared/widgetdatabase.h b/tools/designer/shared/widgetdatabase.h
index 973c699c0..15892ded0 100644
--- a/tools/designer/shared/widgetdatabase.h
+++ b/tools/designer/shared/widgetdatabase.h
@@ -35,7 +35,7 @@
 #define WIDGETDATABASE_H
 
 #include <ntqiconset.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include "../interfaces/widgetinterface.h" // up here for GCC 2.7.* compatibility
 #include <private/qpluginmanager_p.h>
 
diff --git a/tools/designer/tools/tqtconv2ui/main.cpp b/tools/designer/tools/tqtconv2ui/main.cpp
index 208be173b..d88fb9515 100644
--- a/tools/designer/tools/tqtconv2ui/main.cpp
+++ b/tools/designer/tools/tqtconv2ui/main.cpp
@@ -33,7 +33,7 @@
 
 #include <ntqapplication.h>
 #include <private/qpluginmanager_p.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ntqdir.h>
 #include <stdio.h>
 #include "filterinterface.h"
diff --git a/tools/designer/tools/tqtcreatecw/main.cpp b/tools/designer/tools/tqtcreatecw/main.cpp
index 706983a62..aef6cea62 100644
--- a/tools/designer/tools/tqtcreatecw/main.cpp
+++ b/tools/designer/tools/tqtcreatecw/main.cpp
@@ -34,7 +34,7 @@
 #include <ntqfile.h>
 #include <ntqtextstream.h>
 #include <tqvaluelist.h>
-#include <ntqstrlist.h>
+#include <tqstrlist.h>
 #include <ntqmetaobject.h>
 #include <ntqapplication.h>
 
diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index 670b688cd..263d32f48 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -34,7 +34,7 @@
 #include "uic.h"
 #include <ntqfile.h>
 #include <tqimage.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ntqdatetime.h>
 #include <ntqfileinfo.h>
 #include <stdio.h>
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index ebbcb1575..003aa33ff 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -35,7 +35,7 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <tqvaluelist.h>
 #include <ntqfile.h>
 #include <ntqfileinfo.h>
diff --git a/tools/designer/uic/main.cpp b/tools/designer/uic/main.cpp
index af06821e2..0f22a34fb 100644
--- a/tools/designer/uic/main.cpp
+++ b/tools/designer/uic/main.cpp
@@ -38,7 +38,7 @@
 #endif
 #include <ntqapplication.h>
 #include <ntqfile.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ntqdatetime.h>
 #include <ntqsettings.h>
 #define NO_STATIC_COLORS
diff --git a/tools/designer/uic/object.cpp b/tools/designer/uic/object.cpp
index 1306e9c06..748f9ed40 100644
--- a/tools/designer/uic/object.cpp
+++ b/tools/designer/uic/object.cpp
@@ -36,7 +36,7 @@
 #include "domtool.h"
 #include <ntqregexp.h>
 #include <ntqsizepolicy.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 #include "../interfaces/widgetinterface.h"
diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp
index 17e651f06..f1fa74c1f 100644
--- a/tools/designer/uic/subclassing.cpp
+++ b/tools/designer/uic/subclassing.cpp
@@ -36,7 +36,7 @@
 #include "widgetdatabase.h"
 #include "domtool.h"
 #include <ntqfile.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ntqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
diff --git a/tools/designer/uic/uic.cpp b/tools/designer/uic/uic.cpp
index c38802714..80beb449d 100644
--- a/tools/designer/uic/uic.cpp
+++ b/tools/designer/uic/uic.cpp
@@ -36,7 +36,7 @@
 #include "widgetdatabase.h"
 #include "domtool.h"
 #include <ntqfile.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ntqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
diff --git a/tools/designer/uic/uic.h b/tools/designer/uic/uic.h
index 68298665e..81aaa74a0 100644
--- a/tools/designer/uic/uic.h
+++ b/tools/designer/uic/uic.h
@@ -34,8 +34,8 @@
 #ifndef UIC_H
 #define UIC_H
 #include <tqdom.h>
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <tqmap.h>
 #include <ntqtextstream.h>
 #include <ntqpalette.h>
diff --git a/tools/designer/uilib/tqwidgetfactory.h b/tools/designer/uilib/tqwidgetfactory.h
index 4838f6f64..97cbd8534 100644
--- a/tools/designer/uilib/tqwidgetfactory.h
+++ b/tools/designer/uilib/tqwidgetfactory.h
@@ -35,7 +35,7 @@
 #define TQWIDGETFACTORY_H
 
 #ifndef QT_H
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <tqptrlist.h>
 #include <tqimage.h>
 #include <ntqpixmap.h>
diff --git a/tools/linguist/linguist/listviews.h b/tools/linguist/linguist/listviews.h
index 65a296bf8..1deae883b 100644
--- a/tools/linguist/linguist/listviews.h
+++ b/tools/linguist/linguist/listviews.h
@@ -36,7 +36,7 @@
 
 #include "msgedit.h"
 
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <tqptrlist.h>
 #include <ntqregexp.h>
 #include <ntqlistview.h>
diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp
index 5d2a785ea..cce5f2799 100644
--- a/tools/linguist/linguist/msgedit.cpp
+++ b/tools/linguist/linguist/msgedit.cpp
@@ -50,7 +50,7 @@
 #include <ntqtextedit.h>
 #include <ntqpalette.h>
 #include <ntqpushbutton.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqtextview.h>
 #include <ntqwhatsthis.h>
 #include <ntqvbox.h>
diff --git a/tools/linguist/linguist/msgedit.h b/tools/linguist/linguist/msgedit.h
index 9046c2011..b1d29bc9c 100644
--- a/tools/linguist/linguist/msgedit.h
+++ b/tools/linguist/linguist/msgedit.h
@@ -40,8 +40,8 @@
 #include <metatranslator.h>
 
 #include <ntqsplitter.h>
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <tqvaluelist.h>
 #include <ntqscrollview.h>
 #include <ntqpixmap.h>
diff --git a/tools/linguist/linguist/phrase.h b/tools/linguist/linguist/phrase.h
index 627dc7eed..6152cd56e 100644
--- a/tools/linguist/linguist/phrase.h
+++ b/tools/linguist/linguist/phrase.h
@@ -34,7 +34,7 @@
 #ifndef PHRASE_H
 #define PHRASE_H
 
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <tqvaluelist.h>
 
 class Phrase
diff --git a/tools/linguist/linguist/simtexth.cpp b/tools/linguist/linguist/simtexth.cpp
index ab0c992e7..a48ddb6aa 100644
--- a/tools/linguist/linguist/simtexth.cpp
+++ b/tools/linguist/linguist/simtexth.cpp
@@ -38,8 +38,8 @@
 #include <ntqcstring.h>
 #include <ntqdict.h>
 #include <tqmap.h>
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <tqvaluelist.h>
 
 #include <string.h>
diff --git a/tools/linguist/linguist/simtexth.h b/tools/linguist/linguist/simtexth.h
index 132842888..e28cdf7b4 100644
--- a/tools/linguist/linguist/simtexth.h
+++ b/tools/linguist/linguist/simtexth.h
@@ -34,7 +34,7 @@
 #ifndef SIMTEXTH_H
 #define SIMTEXTH_H
 
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <tqvaluelist.h>
 
 class MetaTranslator;
diff --git a/tools/linguist/linguist/trwindow.h b/tools/linguist/linguist/trwindow.h
index f702b7f07..7c81ed15a 100644
--- a/tools/linguist/linguist/trwindow.h
+++ b/tools/linguist/linguist/trwindow.h
@@ -42,7 +42,7 @@
 #include <tqptrlist.h>
 #include <ntqdict.h>
 #include <ntqprinter.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ntqpixmap.h>
 #include <ntqlistview.h>
 
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index 587f62104..29561e091 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -38,8 +38,8 @@
 #include <ntqfile.h>
 #include <ntqfileinfo.h>
 #include <ntqregexp.h>
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <ntqtextstream.h>
 
 #include <errno.h>
diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp
index 8a83c1588..1539a57de 100644
--- a/tools/linguist/lupdate/fetchtr.cpp
+++ b/tools/linguist/lupdate/fetchtr.cpp
@@ -35,7 +35,7 @@
 
 #include <ntqfile.h>
 #include <ntqregexp.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqtextstream.h>
 #include <tqvaluestack.h>
 #include <tqxml.h>
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 1e7225081..3c0e170a6 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -37,8 +37,8 @@
 #include <ntqdir.h>
 #include <ntqfile.h>
 #include <ntqfileinfo.h>
-#include <ntqstring.h>
-#include <ntqstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <ntqtextstream.h>
 
 #include <errno.h>
diff --git a/tools/linguist/lupdate/numberh.cpp b/tools/linguist/lupdate/numberh.cpp
index ac594ef86..919859b6c 100644
--- a/tools/linguist/lupdate/numberh.cpp
+++ b/tools/linguist/lupdate/numberh.cpp
@@ -36,7 +36,7 @@
 #include <ntqmemarray.h>
 #include <ntqcstring.h>
 #include <tqmap.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 
 #include <ctype.h>
 
diff --git a/tools/linguist/shared/metatranslator.h b/tools/linguist/shared/metatranslator.h
index 9eb04c706..36ce7f1be 100644
--- a/tools/linguist/shared/metatranslator.h
+++ b/tools/linguist/shared/metatranslator.h
@@ -35,7 +35,7 @@
 #define METATRANSLATOR_H
 
 #include <tqmap.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqtranslator.h>
 #include <tqvaluelist.h>
 
diff --git a/tools/linguist/shared/proparser.cpp b/tools/linguist/shared/proparser.cpp
index be88eb861..fea008806 100644
--- a/tools/linguist/shared/proparser.cpp
+++ b/tools/linguist/shared/proparser.cpp
@@ -37,7 +37,7 @@
 #include <ntqfile.h>
 #include <ntqfileinfo.h>
 #include <ntqregexp.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ntqtextstream.h>
 
 #ifdef Q_OS_UNIX
diff --git a/tools/linguist/shared/proparser.h b/tools/linguist/shared/proparser.h
index 98692f90c..abfb68c61 100644
--- a/tools/linguist/shared/proparser.h
+++ b/tools/linguist/shared/proparser.h
@@ -35,7 +35,7 @@
 #define PROPARSER_H
 
 #include <tqmap.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 
 TQMap<TQString, TQString> proFileTagMap( const TQString& text );
 
diff --git a/tools/linguist/tqm2ts/main.cpp b/tools/linguist/tqm2ts/main.cpp
index 6e71a3cbc..8d50a346e 100644
--- a/tools/linguist/tqm2ts/main.cpp
+++ b/tools/linguist/tqm2ts/main.cpp
@@ -34,7 +34,7 @@
 #include <metatranslator.h>
 
 #include <ntqregexp.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqtranslator.h>
 
 typedef TQValueList<TQTranslatorMessage> TML;
diff --git a/tools/linguist/tutorial/tt2/main.cpp b/tools/linguist/tutorial/tt2/main.cpp
index 283afe5a6..80b60864c 100644
--- a/tools/linguist/tutorial/tt2/main.cpp
+++ b/tools/linguist/tutorial/tt2/main.cpp
@@ -7,7 +7,7 @@
 #include "mainwindow.h"
 
 #include <ntqapplication.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqtextcodec.h>
 #include <ntqtranslator.h>
 
diff --git a/tools/linguist/tutorial/tt3/main.cpp b/tools/linguist/tutorial/tt3/main.cpp
index c6989494b..aa69e799a 100644
--- a/tools/linguist/tutorial/tt3/main.cpp
+++ b/tools/linguist/tutorial/tt3/main.cpp
@@ -7,7 +7,7 @@
 #include "mainwindow.h"
 
 #include <ntqapplication.h>
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqtextcodec.h>
 #include <ntqtranslator.h>
 
diff --git a/tools/maketqpf/main.cpp b/tools/maketqpf/main.cpp
index 94dc2e143..06ae14011 100644
--- a/tools/maketqpf/main.cpp
+++ b/tools/maketqpf/main.cpp
@@ -38,7 +38,7 @@
 #include <ntqfont.h>
 #include <ntqvbox.h>
 #include <ntqlabel.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ntqlistview.h>
 #include <ntqmainwindow.h>
 #include <ntqmessagebox.h>
diff --git a/tools/qconfig/main.h b/tools/qconfig/main.h
index 311e38cb7..32ee6f2ee 100644
--- a/tools/qconfig/main.h
+++ b/tools/qconfig/main.h
@@ -33,7 +33,7 @@
 
 #include <ntqmainwindow.h>
 #include <tqmap.h>
-#include <ntqstringlist.h>
+#include <tqstringlist.h>
 #include <ntqtextbrowser.h>
 
 class ChoiceItem;
diff --git a/tools/qembed/qembed.cpp b/tools/qembed/qembed.cpp
index 4db18202a..6aaa60702 100644
--- a/tools/qembed/qembed.cpp
+++ b/tools/qembed/qembed.cpp
@@ -16,7 +16,7 @@
 **
 *****************************************************************************/
 
-#include <ntqstring.h>
+#include <tqstring.h>
 #include <ntqfile.h>
 #include <ntqfileinfo.h>
 #include <tqptrlist.h>