diff options
Diffstat (limited to 'tools/designer/plugins')
-rw-r--r-- | tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp | 4 | ||||
-rw-r--r-- | tools/designer/plugins/cppeditor/yyreg.h | 2 | ||||
-rw-r--r-- | tools/designer/plugins/dlg/dlg2ui.cpp | 24 | ||||
-rw-r--r-- | tools/designer/plugins/dlg/dlg2ui.h | 6 | ||||
-rw-r--r-- | tools/designer/plugins/glade/glade2ui.h | 2 | ||||
-rw-r--r-- | tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp | 2 | ||||
-rw-r--r-- | tools/designer/plugins/kdevdlg/kdevdlg2ui.h | 2 | ||||
-rw-r--r-- | tools/designer/plugins/kdevdlg/main.cpp | 2 | ||||
-rw-r--r-- | tools/designer/plugins/rc/rc2ui.cpp | 2 | ||||
-rw-r--r-- | tools/designer/plugins/rc/rc2ui.h | 2 |
10 files changed, 24 insertions, 24 deletions
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 { |