Rename str nt* related files to equivalent tq*HEADmaster

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

50 files changed, 72 insertions, 72 deletions

diff --git a/tools/designer/designer/asciivalidator.cpp b/tools/designer/designer/asciivalidator.cpp
index 640cd1eb..b8126cf2 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 74f5ec88..88a25956 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 bfb7e1e7..0ab766e3 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 4bd1215e..3126d599 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 1a6bf5cb..bcb93727 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 6403b2b5..1b59b2eb 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 dc2f625e..437dec8c 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 e533d350..9203f7f8 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 9e516504..ab7a682e 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 335d84f6..7625a43c 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 07376a19..918f18d4 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 e39a8256..a5aa95b0 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 2c414d9a..85b2b2ec 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 98caedba..2b35c241 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 b2b437d1..a8580dae 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 e254396f..cbf15601 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 3d7919ca..3480c571 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 48dbbe7e..6a7946c0 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 1220d81c..be9a4849 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 71958299..a3ab598f 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 34318493..2aa843bf 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 8a138c84..dc651554 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 e3eba7b5..9319ffbe 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 aa81f68a..982d8314 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 2f6dcc05..58f6d5dc 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 6ea60476..5757f4f1 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 faa341b4..d5dbc2bc 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 bb4922f2..ed6bd52c 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 23e18063..a8993465 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 15b5377e..d500aab5 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 93681822..1d28803e 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 dc52d1e4..ccd7a31c 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 5f2b6d3b..ff7d1955 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 d12cd12c..1092d3dc 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 c43bb65f..d0d6c7af 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 68829211..87a6fb98 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 d001d8bd..f835df71 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 01a25356..75e7e322 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 4a753d3e..5435526f 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 973c699c..15892ded 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 208be173..d88fb951 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 706983a6..aef6cea6 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 670b688c..263d32f4 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 ebbcb157..003aa33f 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 af06821e..0f22a34f 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 1306e9c0..748f9ed4 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 17e651f0..f1fa74c1 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 c3880271..80beb449 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 68298665..81aaa74a 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 4838f6f6..97cbd853 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>