From e63beeb5bdb82987b1e00bc35178667786fbad48 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 16:20:48 -0600 Subject: Fix incorrect conversion --- .../rbkconfig_compiler/rbkconfig_compiler.cpp | 432 ++++++++++----------- 1 file changed, 216 insertions(+), 216 deletions(-) (limited to 'korundum/rubylib/rbkconfig_compiler') diff --git a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp index a3ff32d7..2f81e356 100644 --- a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp +++ b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp @@ -51,23 +51,23 @@ static const KCmdLineOptions options[] = bool globalEnums; bool itemAccessors; -TTQStringList allNames; -TTQRegExp *validNameRegexp; +TQStringList allNames; +TQRegExp *validNameRegexp; class CfgEntry { public: struct Choice { - TTQString name; - TTQString label; - TTQString whatsThis; + TQString name; + TQString label; + TQString whatsThis; }; - CfgEntry( const TTQString &group, const TTQString &type, const TTQString &key, - const TTQString &name, const TTQString &label, - const TTQString &whatsThis, const TTQString &code, - const TTQString &defaultValue, const TTQValueList &choices, + CfgEntry( const TQString &group, const TQString &type, const TQString &key, + const TQString &name, const TQString &label, + const TQString &whatsThis, const TQString &code, + const TQString &defaultValue, const TQValueList &choices, bool hidden ) : mGroup( group ), mType( type ), mKey( key ), mName( name ), mLabel( label ), mWhatsThis( whatsThis ), mCode( code ), @@ -76,53 +76,53 @@ class CfgEntry { } - void setGroup( const TTQString &group ) { mGroup = group; } - TTQString group() const { return mGroup; } + void setGroup( const TQString &group ) { mGroup = group; } + TQString group() const { return mGroup; } - void setType( const TTQString &type ) { mType = type; } - TTQString type() const { return mType; } + void setType( const TQString &type ) { mType = type; } + TQString type() const { return mType; } - void setKey( const TTQString &key ) { mKey = key; } - TTQString key() const { return mKey; } + void setKey( const TQString &key ) { mKey = key; } + TQString key() const { return mKey; } - void setName( const TTQString &name ) { mName = name; } - TTQString name() const { return mName; } + void setName( const TQString &name ) { mName = name; } + TQString name() const { return mName; } - void setLabel( const TTQString &label ) { mLabel = label; } - TTQString label() const { return mLabel; } + void setLabel( const TQString &label ) { mLabel = label; } + TQString label() const { return mLabel; } - void setWhatsThis( const TTQString &whatsThis ) { mWhatsThis = whatsThis; } - TTQString whatsThis() const { return mWhatsThis; } + void setWhatsThis( const TQString &whatsThis ) { mWhatsThis = whatsThis; } + TQString whatsThis() const { return mWhatsThis; } - void setDefaultValue( const TTQString &d ) { mDefaultValue = d; } - TTQString defaultValue() const { return mDefaultValue; } + void setDefaultValue( const TQString &d ) { mDefaultValue = d; } + TQString defaultValue() const { return mDefaultValue; } - void setCode( const TTQString &d ) { mCode = d; } - TTQString code() const { return mCode; } + void setCode( const TQString &d ) { mCode = d; } + TQString code() const { return mCode; } - void setMinValue( const TTQString &d ) { mMin = d; } - TTQString minValue() const { return mMin; } + void setMinValue( const TQString &d ) { mMin = d; } + TQString minValue() const { return mMin; } - void setMaxValue( const TTQString &d ) { mMax = d; } - TTQString maxValue() const { return mMax; } + void setMaxValue( const TQString &d ) { mMax = d; } + TQString maxValue() const { return mMax; } - void setParam( const TTQString &d ) { mParam = d; } - TTQString param() const { return mParam; } + void setParam( const TQString &d ) { mParam = d; } + TQString param() const { return mParam; } - void setParamName( const TTQString &d ) { mParamName = d; } - TTQString paramName() const { return mParamName; } + void setParamName( const TQString &d ) { mParamName = d; } + TQString paramName() const { return mParamName; } - void setParamType( const TTQString &d ) { mParamType = d; } - TTQString paramType() const { return mParamType; } + void setParamType( const TQString &d ) { mParamType = d; } + TQString paramType() const { return mParamType; } - void setChoices( const TTQValueList &d ) { mChoices = d; } - TTQValueList choices() const { return mChoices; } + void setChoices( const TQValueList &d ) { mChoices = d; } + TQValueList choices() const { return mChoices; } - void setParamValues( const TTQStringList &d ) { mParamValues = d; } - TTQStringList paramValues() const { return mParamValues; } + void setParamValues( const TQStringList &d ) { mParamValues = d; } + TQStringList paramValues() const { return mParamValues; } - void setParamDefaultValues( const TTQStringList &d ) { mParamDefaultValues = d; } - TTQString paramDefaultValue(int i) const { return mParamDefaultValues[i]; } + void setParamDefaultValues( const TQStringList &d ) { mParamDefaultValues = d; } + TQString paramDefaultValue(int i) const { return mParamDefaultValues[i]; } void setParamMax( int d ) { mParamMax = d; } int paramMax() const { return mParamMax; } @@ -155,73 +155,73 @@ class CfgEntry } private: - TTQString mGroup; - TTQString mType; - TTQString mKey; - TTQString mName; - TTQString mLabel; - TTQString mWhatsThis; - TTQString mCode; - TTQString mDefaultValue; - TTQString mParam; - TTQString mParamName; - TTQString mParamType; - TTQValueList mChoices; - TTQStringList mParamValues; - TTQStringList mParamDefaultValues; + TQString mGroup; + TQString mType; + TQString mKey; + TQString mName; + TQString mLabel; + TQString mWhatsThis; + TQString mCode; + TQString mDefaultValue; + TQString mParam; + TQString mParamName; + TQString mParamType; + TQValueList mChoices; + TQStringList mParamValues; + TQStringList mParamDefaultValues; int mParamMax; bool mHidden; - TTQString mMin; - TTQString mMax; + TQString mMin; + TQString mMax; }; -static TTQString varName(const TTQString &n) +static TQString varName(const TQString &n) { - TTQString result = "@"+n; + TQString result = "@"+n; result[1] = result[1].lower(); return result; } -static TTQString enumName(const TTQString &n) +static TQString enumName(const TQString &n) { - TTQString result = "Enum"+n; + TQString result = "Enum"+n; result[4] = result[4].upper(); return result; } -static TTQString enumValue(const TTQString &n) +static TQString enumValue(const TQString &n) { - TTQString result = n; + TQString result = n; result[0] = result[0].upper(); return result; } -static TTQString setFunction(const TTQString &n) +static TQString setFunction(const TQString &n) { - TTQString result = "set"+n; + TQString result = "set"+n; result[3] = result[3].upper(); return result; } -static TTQString getFunction(const TTQString &n) +static TQString getFunction(const TQString &n) { - TTQString result = n; + TQString result = n; result[0] = result[0].lower(); return result; } -static void addQuotes( TTQString &s ) +static void addQuotes( TQString &s ) { if ( s.left( 1 ) != "\"" ) s.prepend( "\"" ); if ( s.right( 1 ) != "\"" ) s.append( "\"" ); } -static TTQString quoteString( const TTQString &s ) +static TQString quoteString( const TQString &s ) { - TTQString r = s; + TQString r = s; r.replace( "\\", "\\\\" ); r.replace( "\"", "\\\"" ); r.replace( "\r", "" ); @@ -229,7 +229,7 @@ static TTQString quoteString( const TTQString &s ) return "\"" + r + "\""; } -static TTQString literalString( const TTQString &s ) +static TQString literalString( const TQString &s ) { bool isAscii = true; for(int i = s.length(); i--;) @@ -238,15 +238,15 @@ static TTQString literalString( const TTQString &s ) return quoteString(s); // if (isAscii) -// return "TTQString::fromLatin1( " + quoteString(s) + " )"; +// return "TQString::fromLatin1( " + quoteString(s) + " )"; // else -// return "TTQString::fromUtf8( " + quoteString(s) + " )"; +// return "TQString::fromUtf8( " + quoteString(s) + " )"; } -static TTQString dumpNode(const TTQDomNode &node) +static TQString dumpNode(const TQDomNode &node) { - TTQString msg; - TTQTextStream s(&msg, IO_WriteOnly ); + TQString msg; + TQTextStream s(&msg, IO_WriteOnly ); node.save(s, 0); msg = msg.simplifyWhiteSpace(); @@ -255,7 +255,7 @@ static TTQString dumpNode(const TTQDomNode &node) return msg; } -static TTQString filenameOnly(TTQString path) +static TQString filenameOnly(TQString path) { int i = path.findRev('/'); if (i >= 0) @@ -263,10 +263,10 @@ static TTQString filenameOnly(TTQString path) return path; } -static void preProcessDefault( TTQString &defaultValue, const TTQString &name, - const TTQString &type, - const TTQValueList &choices, - TTQString &code ) +static void preProcessDefault( TQString &defaultValue, const TQString &name, + const TQString &type, + const TQValueList &choices, + TQString &code ) { if ( type == "String" && !defaultValue.isEmpty() ) { defaultValue = literalString(defaultValue); @@ -275,14 +275,14 @@ static void preProcessDefault( TTQString &defaultValue, const TTQString &name, defaultValue = literalString( defaultValue ); } else if ( type == "StringList" && !defaultValue.isEmpty() ) { - TTQTextStream rb( &code, IO_WriteOnly | IO_Append ); + TQTextStream rb( &code, IO_WriteOnly | IO_Append ); if (!code.isEmpty()) rb << endl; -// rb << " TTQStringList default" << name << ";" << endl; +// rb << " TQStringList default" << name << ";" << endl; rb << " default" << name << " = []" << endl; - TTQStringList defaults = TTQStringList::split( ",", defaultValue ); - TTQStringList::ConstIterator it; + TQStringList defaults = TQStringList::split( ",", defaultValue ); + TQStringList::ConstIterator it; for( it = defaults.begin(); it != defaults.end(); ++it ) { rb << " default" << name << " << \"" << *it << "\"" << endl; @@ -290,7 +290,7 @@ static void preProcessDefault( TTQString &defaultValue, const TTQString &name, defaultValue = "default" + name; } else if ( type == "Color" && !defaultValue.isEmpty() ) { - TTQRegExp colorRe("\\d+,\\s*\\d+,\\s*\\d+"); + TQRegExp colorRe("\\d+,\\s*\\d+,\\s*\\d+"); if (colorRe.exactMatch(defaultValue)) { defaultValue = "TQt::Color.new( " + defaultValue + " )"; @@ -302,7 +302,7 @@ static void preProcessDefault( TTQString &defaultValue, const TTQString &name, } else if ( type == "Enum" ) { if ( !globalEnums ) { - TTQValueList::ConstIterator it; + TQValueList::ConstIterator it; for( it = choices.begin(); it != choices.end(); ++it ) { if ( (*it).name == defaultValue ) { defaultValue.prepend( enumName(name) + "_"); @@ -312,13 +312,13 @@ static void preProcessDefault( TTQString &defaultValue, const TTQString &name, } } else if ( type == "IntList" ) { - TTQTextStream rb( &code, IO_WriteOnly | IO_Append ); + TQTextStream rb( &code, IO_WriteOnly | IO_Append ); if (!code.isEmpty()) rb << endl; rb << " default" << name << " = []" << endl; - TTQStringList defaults = TTQStringList::split( ",", defaultValue ); - TTQStringList::ConstIterator it; + TQStringList defaults = TQStringList::split( ",", defaultValue ); + TQStringList::ConstIterator it; for( it = defaults.begin(); it != defaults.end(); ++it ) { rb << " default" << name << " << " << *it << "" << endl; @@ -328,31 +328,31 @@ static void preProcessDefault( TTQString &defaultValue, const TTQString &name, } -CfgEntry *parseEntry( const TTQString &group, const TTQDomElement &element ) +CfgEntry *parseEntry( const TQString &group, const TQDomElement &element ) { bool defaultCode = false; - TTQString type = element.attribute( "type" ); - TTQString name = element.attribute( "name" ); - TTQString key = element.attribute( "key" ); - TTQString hidden = element.attribute( "hidden" ); - TTQString label; - TTQString whatsThis; - TTQString defaultValue; - TTQString code; - TTQString param; - TTQString paramName; - TTQString paramType; - TTQValueList choices; - TTQStringList paramValues; - TTQStringList paramDefaultValues; - TTQString minValue; - TTQString maxValue; + TQString type = element.attribute( "type" ); + TQString name = element.attribute( "name" ); + TQString key = element.attribute( "key" ); + TQString hidden = element.attribute( "hidden" ); + TQString label; + TQString whatsThis; + TQString defaultValue; + TQString code; + TQString param; + TQString paramName; + TQString paramType; + TQValueList choices; + TQStringList paramValues; + TQStringList paramDefaultValues; + TQString minValue; + TQString maxValue; int paramMax = 0; - TTQDomNode n; + TQDomNode n; for ( n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) { - TTQDomElement e = n.toElement(); - TTQString tag = e.tagName(); + TQDomElement e = n.toElement(); + TQString tag = e.tagName(); if ( tag == "label" ) label = e.text(); else if ( tag == "whatsthis" ) whatsThis = e.text(); else if ( tag == "min" ) minValue = e.text(); @@ -382,14 +382,14 @@ CfgEntry *parseEntry( const TTQString &group, const TTQDomElement &element ) } else if (paramType == "Enum") { - TTQDomNode n2; + TQDomNode n2; for ( n2 = e.firstChild(); !n2.isNull(); n2 = n2.nextSibling() ) { - TTQDomElement e2 = n2.toElement(); + TQDomElement e2 = n2.toElement(); if (e2.tagName() == "values") { - TTQDomNode n3; + TQDomNode n3; for ( n3 = e2.firstChild(); !n3.isNull(); n3 = n3.nextSibling() ) { - TTQDomElement e3 = n3.toElement(); + TQDomElement e3 = n3.toElement(); if (e3.tagName() == "value") { paramValues.append( e3.text() ); @@ -421,18 +421,18 @@ CfgEntry *parseEntry( const TTQString &group, const TTQDomElement &element ) } } else if ( tag == "choices" ) { - TTQDomNode n2; + TQDomNode n2; for( n2 = e.firstChild(); !n2.isNull(); n2 = n2.nextSibling() ) { - TTQDomElement e2 = n2.toElement(); + TQDomElement e2 = n2.toElement(); if ( e2.tagName() == "choice" ) { - TTQDomNode n3; + TQDomNode n3; CfgEntry::Choice choice; choice.name = e2.attribute( "name" ); if ( choice.name.isEmpty() ) { kdError() << "Tag retquires attribute 'name'." << endl; } for( n3 = e2.firstChild(); !n3.isNull(); n3 = n3.nextSibling() ) { - TTQDomElement e3 = n3.toElement(); + TQDomElement e3 = n3.toElement(); if ( e3.tagName() == "label" ) choice.label = e3.text(); if ( e3.tagName() == "whatsthis" ) choice.whatsThis = e3.text(); } @@ -454,7 +454,7 @@ CfgEntry *parseEntry( const TTQString &group, const TTQDomElement &element ) if ( nameIsEmpty ) { name = key; - name.replace( " ", TTQString::null ); + name.replace( " ", TQString::null ); } else if ( name.contains( ' ' ) ) { kdWarning()<<"Entry '"< elements can't contain speces!"< &"; + else if ( type == "IntList" ) return "const TQValueList &"; else if ( type == "Enum" ) return "int"; - else if ( type == "Path" ) return "const TTQString &"; - else if ( type == "Password" ) return "const TTQString &"; + else if ( type == "Path" ) return "const TQString &"; + else if ( type == "Password" ) return "const TQString &"; else { kdError() <<"rbkconfig_compiler does not support type \""<< type <<"\""<name() ) + "Item"; @@ -678,10 +678,10 @@ static TTQString itemVar(const CfgEntry *e) } -TTQString newItem( const TTQString &type, const TTQString &name, const TTQString &key, - const TTQString &defaultValue, const TTQString ¶m = TTQString::null) +TQString newItem( const TQString &type, const TQString &name, const TQString &key, + const TQString &defaultValue, const TQString ¶m = TQString::null) { - TTQString t = "Item" + itemType( type ) + + TQString t = "Item" + itemType( type ) + ".new( currentGroup(), " + key + ", " + varName( name ) + param; if ( type == "Enum" ) { t += ".toInt"; @@ -703,11 +703,11 @@ TTQString newItem( const TTQString &type, const TTQString &name, const TTQString return t; } -TTQString addItem( const TTQString &type, const TTQString &name, const TTQString &key, - const TTQString &defaultValue, const TTQString ¶m = TTQString::null, - const TTQString ¶mName = TTQString::null ) +TQString addItem( const TQString &type, const TQString &name, const TQString &key, + const TQString &defaultValue, const TQString ¶m = TQString::null, + const TQString ¶mName = TQString::null ) { - TTQString t = "addItem" + itemType( type ) + + TQString t = "addItem" + itemType( type ) + "( " + key + ", " + varName( name ) + param; if ( type == "Enum" ) t += ", values" + name; if ( !defaultValue.isEmpty() ) { @@ -726,20 +726,20 @@ TTQString addItem( const TTQString &type, const TTQString &name, const TTQString return t; } -TTQString paramString(const TTQString &s, const CfgEntry *e, int i) +TQString paramString(const TQString &s, const CfgEntry *e, int i) { - TTQString result = s; - TTQString needle = "$("+e->param()+")"; + TQString result = s; + TQString needle = "$("+e->param()+")"; if (result.contains(needle)) { - TTQString tmp; + TQString tmp; if (e->paramType() == "Enum") { tmp = e->paramValues()[i]; } else { - tmp = TTQString::number(i); + tmp = TQString::number(i); } result.replace(needle, tmp); @@ -747,12 +747,12 @@ TTQString paramString(const TTQString &s, const CfgEntry *e, int i) return result; } -TTQString paramString(const TTQString &group, const TTQStringList ¶meters) +TQString paramString(const TQString &group, const TQStringList ¶meters) { - TTQString paramString = group; - TTQString arguments; + TQString paramString = group; + TQString arguments; int i = 0; - for( TTQStringList::ConstIterator it = parameters.begin(); + for( TQStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it) { if (paramString.contains("$("+*it+")")) @@ -776,9 +776,9 @@ TTQString paramString(const TTQString &group, const TTQStringList ¶meters) } /* int i is the value of the parameter */ -TTQString userTextsFunctions( CfgEntry *e, TTQString itemVarStr=TTQString::null, TTQString i=TTQString::null ) +TQString userTextsFunctions( CfgEntry *e, TQString itemVarStr=TQString::null, TQString i=TQString::null ) { - TTQString txt; + TQString txt; if (itemVarStr.isNull()) itemVarStr=itemVar(e); if ( !e->label().isEmpty() ) { txt += " " + itemVarStr + ".setLabel( i18n("; @@ -827,35 +827,35 @@ int main( int argc, char **argv ) return 1; } - validNameRegexp = new TTQRegExp("[a-zA-Z_][a-zA-Z0-9_]*"); + validNameRegexp = new TQRegExp("[a-zA-Z_][a-zA-Z0-9_]*"); - TTQString baseDir = TTQFile::decodeName(args->getOption("directory")); + TQString baseDir = TQFile::decodeName(args->getOption("directory")); if (!baseDir.endsWith("/")) baseDir.append("/"); - TTQString inputFilename = args->url( 0 ).path(); - TTQString codegenFilename = args->url( 1 ).path(); + TQString inputFilename = args->url( 0 ).path(); + TQString codegenFilename = args->url( 1 ).path(); if (!codegenFilename.endsWith(".kcfgc")) { kdError() << "Codegen options file must have extension .kcfgc" << endl; return 1; } - TTQString baseName = args->url( 1 ).fileName(); + TQString baseName = args->url( 1 ).fileName(); baseName = baseName.left(baseName.length() - 6); KSimpleConfig codegenConfig( codegenFilename, true ); - TTQString nameSpace = codegenConfig.readEntry("NameSpace"); - TTQString className = codegenConfig.readEntry("ClassName"); - TTQString inherits = codegenConfig.readEntry("Inherits"); - TTQString visibility = codegenConfig.readEntry("Visibility"); + TQString nameSpace = codegenConfig.readEntry("NameSpace"); + TQString className = codegenConfig.readEntry("ClassName"); + TQString inherits = codegenConfig.readEntry("Inherits"); + TQString visibility = codegenConfig.readEntry("Visibility"); if (!visibility.isEmpty()) visibility+=" "; bool singleton = codegenConfig.readBoolEntry("Singleton", false); bool customAddons = codegenConfig.readBoolEntry("CustomAdditions"); - TTQString memberVariables = codegenConfig.readEntry("MemberVariables"); - TTQStringList headerIncludes = codegenConfig.readListEntry("IncludeFiles"); - TTQStringList mutators = codegenConfig.readListEntry("Mutators"); + TQString memberVariables = codegenConfig.readEntry("MemberVariables"); + TQStringList headerIncludes = codegenConfig.readListEntry("IncludeFiles"); + TQStringList mutators = codegenConfig.readListEntry("Mutators"); bool allMutators = false; if ((mutators.count() == 1) && (mutators[0].lower() == "true")) allMutators = true; @@ -864,10 +864,10 @@ int main( int argc, char **argv ) globalEnums = codegenConfig.readBoolEntry( "GlobalEnums", false ); - TTQFile input( inputFilename ); + TQFile input( inputFilename ); - TTQDomDocument doc; - TTQString errorMsg; + TQDomDocument doc; + TQString errorMsg; int errorRow; int errorCol; if ( !doc.setContent( &input, &errorMsg, &errorRow, &errorCol ) ) { @@ -876,52 +876,52 @@ int main( int argc, char **argv ) return 1; } - TTQDomElement cfgElement = doc.documentElement(); + TQDomElement cfgElement = doc.documentElement(); if ( cfgElement.isNull() ) { kdError() << "No document in kcfg file" << endl; return 1; } - TTQString cfgFileName; + TQString cfgFileName; bool cfgFileNameArg = false; - TTQStringList parameters; - TTQStringList includes; + TQStringList parameters; + TQStringList includes; - TTQPtrList entries; + TQPtrList entries; entries.setAutoDelete( true ); - TTQDomNode n; + TQDomNode n; for ( n = cfgElement.firstChild(); !n.isNull(); n = n.nextSibling() ) { - TTQDomElement e = n.toElement(); + TQDomElement e = n.toElement(); - TTQString tag = e.tagName(); + TQString tag = e.tagName(); if ( tag == "include" ) { - TTQString includeFile = e.text(); + TQString includeFile = e.text(); if (!includeFile.isEmpty()) includes.append(includeFile); } else if ( tag == "kcfgfile" ) { cfgFileName = e.attribute( "name" ); cfgFileNameArg = e.attribute( "arg" ).lower() == "true"; - TTQDomNode n2; + TQDomNode n2; for( n2 = e.firstChild(); !n2.isNull(); n2 = n2.nextSibling() ) { - TTQDomElement e2 = n2.toElement(); + TQDomElement e2 = n2.toElement(); if ( e2.tagName() == "parameter" ) { parameters.append( e2.attribute( "name" ) ); } } } else if ( tag == "group" ) { - TTQString group = e.attribute( "name" ); + TQString group = e.attribute( "name" ); if ( group.isEmpty() ) { kdError() << "Group without name" << endl; return 1; } - TTQDomNode n2; + TQDomNode n2; for( n2 = e.firstChild(); !n2.isNull(); n2 = n2.nextSibling() ) { - TTQDomElement e2 = n2.toElement(); + TQDomElement e2 = n2.toElement(); if ( e2.tagName() != "entry" ) continue; CfgEntry *entry = parseEntry( group, e2 ); if ( entry ) entries.append( entry ); @@ -968,15 +968,15 @@ int main( int argc, char **argv ) } #endif - TTQString implementationFileName = baseName + ".rb"; + TQString implementationFileName = baseName + ".rb"; - TTQFile implementation( baseDir + implementationFileName ); + TQFile implementation( baseDir + implementationFileName ); if ( !implementation.open( IO_WriteOnly ) ) { kdError() << "Can't open '" << implementationFileName << "for writing." << endl; return 1; } - TTQTextStream rb( &implementation ); + TQTextStream rb( &implementation ); rb << "# This file is generated by rbkconfig_compiler from " << args->url(0).fileName() << "." << endl; rb << "# All changes you do to this file will be lost." << endl; @@ -994,7 +994,7 @@ int main( int argc, char **argv ) // << className.upper() << "_H" << endl << endl; // Includes -// TTQStringList::ConstIterator it; +// TQStringList::ConstIterator it; // for( it = headerIncludes.begin(); it != headerIncludes.end(); ++it ) { // rb << "#include <" << *it << ">" << endl; // } @@ -1016,10 +1016,10 @@ int main( int argc, char **argv ) // enums CfgEntry *e; for( e = entries.first(); e; e = entries.next() ) { - TTQValueList choices = e->choices(); + TQValueList choices = e->choices(); if ( !choices.isEmpty() ) { - TTQStringList values; - TTQValueList::ConstIterator itChoice; + TQStringList values; + TQValueList::ConstIterator itChoice; for( itChoice = choices.begin(); itChoice != choices.end(); ++itChoice ) { if (globalEnums) { values.append( enumValue((*itChoice).name) ); @@ -1031,16 +1031,16 @@ int main( int argc, char **argv ) values.append( enumName(e->name()) + "_COUNT" ); } int count = 0; - for ( TTQStringList::Iterator it = values.begin(); it != values.end(); ++it, count++ ) { + for ( TQStringList::Iterator it = values.begin(); it != values.end(); ++it, count++ ) { rb << " " << *it << " = " << count << endl; } rb << endl; } - TTQStringList values = e->paramValues(); + TQStringList values = e->paramValues(); if ( !values.isEmpty() ) { int count = 0; - for ( TTQStringList::Iterator it = values.begin(); it != values.end(); ++it, count++ ) { + for ( TQStringList::Iterator it = values.begin(); it != values.end(); ++it, count++ ) { if (globalEnums) { rb << " " << enumValue(*it) << " = " << count << endl; } else { @@ -1055,7 +1055,7 @@ int main( int argc, char **argv ) rb << " def " << enumName(e->param()) << "ToString(i)" << endl; rb << " ["; count = 0; - for ( TTQStringList::Iterator it = values.begin(); it != values.end(); ++it, count++ ) { + for ( TQStringList::Iterator it = values.begin(); it != values.end(); ++it, count++ ) { if (count > 0) { rb << ", "; } @@ -1071,8 +1071,8 @@ int main( int argc, char **argv ) rb << endl; for( e = entries.first(); e; e = entries.next() ) { - TTQString n = e->name(); - TTQString t = e->type(); + TQString n = e->name(); + TQString t = e->type(); // Manipulator if (allMutators || mutators.contains(n)) @@ -1180,7 +1180,7 @@ int main( int argc, char **argv ) rb << " def initialize( "; if (cfgFileNameArg) rb << " config" << (parameters.isEmpty() ? " " : ", "); - for (TTQStringList::ConstIterator it = parameters.begin(); + for (TQStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it) { if (it != parameters.begin()) @@ -1196,13 +1196,13 @@ int main( int argc, char **argv ) rb << ")" << endl; // Store parameters - for (TTQStringList::ConstIterator it = parameters.begin(); + for (TQStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it) { rb << " @param" << *it << " = TQt::Variant.new( " << *it << " )" << endl; } - TTQString group; + TQString group; for( e = entries.first(); e; e = entries.next() ) { if ( e->group() != group ) { group = e->group(); @@ -1227,7 +1227,7 @@ int main( int argc, char **argv ) rb << endl; - group = TTQString::null; + group = TQString::null; for( e = entries.first(); e; e = entries.next() ) { if ( e->group() != group ) { if ( !group.isEmpty() ) rb << endl; @@ -1235,7 +1235,7 @@ int main( int argc, char **argv ) rb << " setCurrentGroup( " << paramString(group, parameters) << " )" << endl << endl; } - TTQString key = paramString(e->key(), parameters); + TQString key = paramString(e->key(), parameters); if ( !e->code().isEmpty()) { rb << e->code() << endl; @@ -1243,8 +1243,8 @@ int main( int argc, char **argv ) if ( e->type() == "Enum" ) { rb << " values" << e->name() << " = []" << endl; - TTQValueList choices = e->choices(); - TTQValueList::ConstIterator it; + TQValueList choices = e->choices(); + TQValueList::ConstIterator it; for( it = choices.begin(); it != choices.end(); ++it ) { rb << " choice = ItemEnum::Choice.new" << endl; rb << " choice.name = \"" << enumValue((*it).name) << "\" " << endl; @@ -1275,7 +1275,7 @@ int main( int argc, char **argv ) rb << userTextsFunctions( e ); rb << " addItem( " << itemVar(e); - TTQString quotedName = e->name(); + TQString quotedName = e->name(); addQuotes( quotedName ); if ( quotedName != key ) rb << ", \"" << e->name() << "\""; rb << " )" << endl; @@ -1286,8 +1286,8 @@ int main( int argc, char **argv ) rb << " " << itemVar(e) << " = Array.new(" << e->paramMax()+1 << ")" << endl; for(int i = 0; i <= e->paramMax(); i++) { - TTQString defaultStr; - TTQString itemVarStr(itemVar(e)+TTQString("[%1]").arg(i)); + TQString defaultStr; + TQString itemVarStr(itemVar(e)+TQString("[%1]").arg(i)); if ( !e->paramDefaultValue(i).isEmpty() ) defaultStr = e->paramDefaultValue(i); @@ -1297,10 +1297,10 @@ int main( int argc, char **argv ) defaultStr = defaultValue( e->type() ); rb << " " << itemVarStr << " = " - << newItem( e->type(), e->name(), paramString(key, e, i), defaultStr, TTQString("[%1]").arg(i) ) + << newItem( e->type(), e->name(), paramString(key, e, i), defaultStr, TQString("[%1]").arg(i) ) << endl; - rb << " " << itemVarStr << ".property = " << varName(e->name())+TTQString("[%1]").arg(i) << endl; + rb << " " << itemVarStr << ".property = " << varName(e->name())+TQString("[%1]").arg(i) << endl; if ( setUserTexts ) rb << userTextsFunctions( e, itemVarStr, e->paramName() ); -- cgit v1.2.1