From 36a36a5c1015aa0d03f4515c401e907ddb9d6291 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kode/kwsdl/converter.cpp | 34 ++++++------ kode/kwsdl/kung/binaryinputfield.cpp | 12 ++-- kode/kwsdl/kung/binaryinputfield.h | 6 +- kode/kwsdl/kung/boolinputfield.cpp | 8 +-- kode/kwsdl/kung/boolinputfield.h | 4 +- kode/kwsdl/kung/complexbaseinputfield.cpp | 8 +-- kode/kwsdl/kung/complexbaseinputfield.h | 4 +- kode/kwsdl/kung/dateinputfield.cpp | 8 +-- kode/kwsdl/kung/dateinputfield.h | 4 +- kode/kwsdl/kung/doubleinputfield.cpp | 8 +-- kode/kwsdl/kung/doubleinputfield.h | 4 +- kode/kwsdl/kung/enuminputfield.cpp | 8 +-- kode/kwsdl/kung/enuminputfield.h | 4 +- kode/kwsdl/kung/inputdialog.cpp | 4 +- kode/kwsdl/kung/inputdialog.h | 2 +- kode/kwsdl/kung/inputfield.h | 4 +- kode/kwsdl/kung/integerinputfield.cpp | 8 +-- kode/kwsdl/kung/integerinputfield.h | 4 +- kode/kwsdl/kung/listinputfield.cpp | 12 ++-- kode/kwsdl/kung/listinputfield.h | 6 +- kode/kwsdl/kung/outputdialog.cpp | 4 +- kode/kwsdl/kung/outputdialog.h | 2 +- kode/kwsdl/kung/pageinputfield.cpp | 8 +-- kode/kwsdl/kung/pageinputfield.h | 4 +- kode/kwsdl/kung/simplebaseinputfield.cpp | 8 +-- kode/kwsdl/kung/simplebaseinputfield.h | 4 +- kode/kwsdl/kung/stringinputfield.cpp | 8 +-- kode/kwsdl/kung/stringinputfield.h | 4 +- kode/kwsdl/kung/timeinputfield.cpp | 8 +-- kode/kwsdl/kung/timeinputfield.h | 4 +- kode/kwsdl/parser.cpp | 22 ++++---- kode/kwsdl/schema/parser.cpp | 2 +- kode/kwsdl/tests/google/serializer.cpp | 92 +++++++++++++++---------------- kode/kwsdl/tests/google/serializer.h | 44 +++++++-------- 34 files changed, 183 insertions(+), 183 deletions(-) (limited to 'kode/kwsdl') diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp index f8d25801..a858f5d4 100644 --- a/kode/kwsdl/converter.cpp +++ b/kode/kwsdl/converter.cpp @@ -218,13 +218,13 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type ) KODE::Function marshal( "marshal", "void" ); marshal.setStatic( true ); marshal.addArgument( "TQDomDocument &doc" ); - marshal.addArgument( "TQDomElement &tqparent" ); + marshal.addArgument( "TQDomElement &parent" ); marshal.addArgument( "const TQString &name" ); marshal.addArgument( "const " + typeName + "* value" ); KODE::Function demarshal( "demarshal", "void" ); demarshal.setStatic( true ); - demarshal.addArgument( "const TQDomElement &tqparent" ); + demarshal.addArgument( "const TQDomElement &parent" ); demarshal.addArgument( typeName + "* value" ); KODE::Code marshalCode, demarshalCode, code; @@ -275,7 +275,7 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type ) // marshal marshalCode += "TQDomElement root = doc.createElement( name );"; marshalCode += "root.setAttribute( \"xsi:type\", \"ns1:" + type->name() + "\" );"; - marshalCode += "tqparent.appendChild( root );"; + marshalCode += "parent.appendChild( root );"; marshalCode += "root.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );"; // demarshal value @@ -294,23 +294,23 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type ) demarshalValue.setBody( code ); // demarshal - demarshalCode += "Serializer::demarshalValue( tqparent.text(), value );"; + demarshalCode += "Serializer::demarshalValue( parent.text(), value );"; mSerializer.addFunction( marshalValue ); mSerializer.addFunction( demarshalValue ); } else if ( type->baseType() != Schema::XSDType::INVALID ) { marshalCode += "if ( value->value() ) {"; marshalCode.indent(); - marshalCode += "Serializer::marshal( doc, tqparent, name, value->value() );"; + marshalCode += "Serializer::marshal( doc, parent, name, value->value() );"; marshalCode.unindent(); marshalCode += "}"; - demarshalCode += "const TQString text = tqparent.text();"; + demarshalCode += "const TQString text = parent.text();"; demarshalCode.newLine(); demarshalCode += "if ( !text.isEmpty() ) {"; demarshalCode.indent(); demarshalCode += baseType + "* data = new " + baseType + ";"; - demarshalCode += "Serializer::demarshal( tqparent, value );"; + demarshalCode += "Serializer::demarshal( parent, value );"; demarshalCode += "value->setValue( data );"; demarshalCode.unindent(); demarshalCode += "}"; @@ -352,12 +352,12 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type ) marshalCode += "}"; marshalCode.newLine(); marshalCode += "TQDomElement element = doc.createElement( name );"; - marshalCode += "tqparent.appendChild( element );"; + marshalCode += "parent.appendChild( element );"; marshalCode += "element.appendChild( doc.createTextNode( list.join( \" \" ) ) );"; marshalCode.unindent(); marshalCode += "}"; - demarshalCode += "const TQStringList list = TQStringList::split( \" \", tqparent.text(), false );"; + demarshalCode += "const TQStringList list = TQStringList::split( \" \", parent.text(), false );"; demarshalCode += "if ( !list.isEmpty() ) {"; demarshalCode.indent(); demarshalCode += "TQPtrList<" + listType + ">* entries = new TQPtrList<" + listType + ">;"; @@ -511,13 +511,13 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type ) KODE::Function marshal( "marshal", "void" ); marshal.setStatic( true ); marshal.addArgument( "TQDomDocument &doc" ); - marshal.addArgument( "TQDomElement &tqparent" ); + marshal.addArgument( "TQDomElement &parent" ); marshal.addArgument( "const TQString &name" ); marshal.addArgument( "const " + typeName + "* value" ); KODE::Function demarshal( "demarshal", "void" ); demarshal.setStatic( true ); - demarshal.addArgument( "const TQDomElement &tqparent" ); + demarshal.addArgument( "const TQDomElement &parent" ); demarshal.addArgument( typeName + "* value" ); KODE::Code marshalCode, demarshalCode, demarshalFinalCode; @@ -535,9 +535,9 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type ) marshalCode += "TQDomElement root = doc.createElement( name );"; marshalCode += "root.setAttribute( \"xsi:type\", \"ns1:" + typeName + "\" );"; - marshalCode += "tqparent.appendChild( root );"; + marshalCode += "parent.appendChild( root );"; - demarshalCode += "TQDomNode node = tqparent.firstChild();"; + demarshalCode += "TQDomNode node = parent.firstChild();"; demarshalCode += "while ( !node.isNull() ) {"; demarshalCode.indent(); demarshalCode += "TQDomElement element = node.toElement();"; @@ -568,7 +568,7 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type ) marshalCode += "element.setAttribute( \"xmlns:ns1\", \"http://schemas.xmlsoap.org/soap/encoding/\" );"; marshalCode += "element.setAttribute( \"xsi:type\", \"ns1:Array\" );"; marshalCode += "element.setAttribute( \"ns1:arrayType\", \"ns1:" + typeName + "[\" + TQString::number( list->count() ) + \"]\" );"; - marshalCode += "tqparent.appendChild( element );"; + marshalCode += "parent.appendChild( element );"; marshalCode.newLine(); marshalCode += "TQPtrListIterator<" + typeName + "> it( *list );"; marshalCode += "while ( it.current() != 0 ) {"; @@ -629,7 +629,7 @@ void Converter::createComplexTypeSerializer( const Schema::ComplexType *type ) marshalCode += "if ( value->" + mNameMapper.escape( lowerName ) + "() )"; marshalCode.indent(); - marshalCode += "tqparent.setAttribute( \"" + (*attrIt).name() + "\"," + marshalCode += "parent.setAttribute( \"" + (*attrIt).name() + "\"," "Serializer::marshalValue( value->" + mNameMapper.escape( lowerName ) + "() ) );"; marshalCode.newLine(); @@ -879,7 +879,7 @@ void Converter::createUtilClasses() marshal = KODE::Function( "marshal", "void" ); marshal.setStatic( true ); marshal.addArgument( "TQDomDocument &doc" ); - marshal.addArgument( "TQDomElement &tqparent" ); + marshal.addArgument( "TQDomElement &parent" ); marshal.addArgument( "const TQString &name" ); marshal.addArgument( "const " + entry.type + "* value" ); @@ -887,7 +887,7 @@ void Converter::createUtilClasses() code += "TQDomElement element = doc.createElement( name );"; code += "element.setAttribute( \"xsi:type\", \"" + entry.xsdType + "\" );"; code += "element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) );"; - code += "tqparent.appendChild( element );"; + code += "parent.appendChild( element );"; marshal.setBody( code ); mSerializer.addFunction( marshal ); diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index ef798812..8d897c4c 100644 --- a/kode/kwsdl/kung/binaryinputfield.cpp +++ b/kode/kwsdl/kung/binaryinputfield.cpp @@ -55,14 +55,14 @@ void BinaryInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void BinaryInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void BinaryInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:" + mTypeName ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void BinaryInputField::setData( const TQString &data ) @@ -76,9 +76,9 @@ TQString BinaryInputField::data() const return TQString::fromUtf8( data.data(), data.size() ); } -TQWidget *BinaryInputField::createWidget( TQWidget *tqparent ) +TQWidget *BinaryInputField::createWidget( TQWidget *parent ) { - mInputWidget = new BinaryWidget( tqparent ); + mInputWidget = new BinaryWidget( parent ); if ( !mValue.isEmpty() ) mInputWidget->setData( mValue ); @@ -94,8 +94,8 @@ void BinaryInputField::valueChanged( const TQByteArray &value ) } -BinaryWidget::BinaryWidget( TQWidget *tqparent ) - : TQWidget( tqparent, "BinaryWidget" ), +BinaryWidget::BinaryWidget( TQWidget *parent ) + : TQWidget( parent, "BinaryWidget" ), mMainWidget( 0 ) { mLayout = new TQGridLayout( this, 3, 2, 11, 6 ); diff --git a/kode/kwsdl/kung/binaryinputfield.h b/kode/kwsdl/kung/binaryinputfield.h index ad586f5d..636b6a24 100644 --- a/kode/kwsdl/kung/binaryinputfield.h +++ b/kode/kwsdl/kung/binaryinputfield.h @@ -39,12 +39,12 @@ class BinaryInputField : public SimpleInputField BinaryInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void valueChanged( const TQByteArray &value ); @@ -62,7 +62,7 @@ class BinaryWidget : public TQWidget TQ_OBJECT public: - BinaryWidget( TQWidget *tqparent ); + BinaryWidget( TQWidget *parent ); void setData( const TQByteArray &data ); diff --git a/kode/kwsdl/kung/boolinputfield.cpp b/kode/kwsdl/kung/boolinputfield.cpp index c05df02b..e3eb3eef 100644 --- a/kode/kwsdl/kung/boolinputfield.cpp +++ b/kode/kwsdl/kung/boolinputfield.cpp @@ -39,14 +39,14 @@ void BoolInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void BoolInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void BoolInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:boolean" ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void BoolInputField::setData( const TQString &data ) @@ -59,9 +59,9 @@ TQString BoolInputField::data() const return ( mValue ? "true" : "false" ); } -TQWidget *BoolInputField::createWidget( TQWidget *tqparent ) +TQWidget *BoolInputField::createWidget( TQWidget *parent ) { - mInputWidget = new TQCheckBox( tqparent ); + mInputWidget = new TQCheckBox( parent ); mInputWidget->setChecked( mValue ); diff --git a/kode/kwsdl/kung/boolinputfield.h b/kode/kwsdl/kung/boolinputfield.h index c48ca96b..c2cda0c8 100644 --- a/kode/kwsdl/kung/boolinputfield.h +++ b/kode/kwsdl/kung/boolinputfield.h @@ -37,12 +37,12 @@ class BoolInputField : public SimpleInputField BoolInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( bool ); diff --git a/kode/kwsdl/kung/complexbaseinputfield.cpp b/kode/kwsdl/kung/complexbaseinputfield.cpp index 30662690..bfcd375e 100644 --- a/kode/kwsdl/kung/complexbaseinputfield.cpp +++ b/kode/kwsdl/kung/complexbaseinputfield.cpp @@ -99,7 +99,7 @@ void ComplexBaseInputField::setXMLData( const TQDomElement &element ) } } -void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); @@ -125,7 +125,7 @@ void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &tqpa } } - tqparent.appendChild( element ); + parent.appendChild( element ); } void ComplexBaseInputField::setData( const TQString& ) @@ -137,9 +137,9 @@ TQString ComplexBaseInputField::data() const return TQString(); } -TQWidget *ComplexBaseInputField::createWidget( TQWidget *tqparent ) +TQWidget *ComplexBaseInputField::createWidget( TQWidget *parent ) { - TQGroupBox *inputWidget = new TQGroupBox( mName, tqparent ); + TQGroupBox *inputWidget = new TQGroupBox( mName, parent ); inputWidget->setColumnLayout( 0, TQt::Horizontal ); TQGridLayout *tqlayout = new TQGridLayout( inputWidget->tqlayout(), 2, 2, 6 ); diff --git a/kode/kwsdl/kung/complexbaseinputfield.h b/kode/kwsdl/kung/complexbaseinputfield.h index f47c6d04..9fc47dbc 100644 --- a/kode/kwsdl/kung/complexbaseinputfield.h +++ b/kode/kwsdl/kung/complexbaseinputfield.h @@ -30,12 +30,12 @@ class ComplexBaseInputField : public ComplexInputField ComplexBaseInputField( const TQString &name, const Schema::ComplexType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); }; #endif diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp index ffb9af7a..d49c1947 100644 --- a/kode/kwsdl/kung/dateinputfield.cpp +++ b/kode/kwsdl/kung/dateinputfield.cpp @@ -39,14 +39,14 @@ void DateInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void DateInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void DateInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:date" ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void DateInputField::setData( const TQString &data ) @@ -59,9 +59,9 @@ TQString DateInputField::data() const return mValue.toString( TQt::ISODate ); } -TQWidget *DateInputField::createWidget( TQWidget *tqparent ) +TQWidget *DateInputField::createWidget( TQWidget *parent ) { - mInputWidget = new KDatePicker( tqparent ); + mInputWidget = new KDatePicker( parent ); mInputWidget->setDate( mValue ); diff --git a/kode/kwsdl/kung/dateinputfield.h b/kode/kwsdl/kung/dateinputfield.h index 8dcd0f89..082bb562 100644 --- a/kode/kwsdl/kung/dateinputfield.h +++ b/kode/kwsdl/kung/dateinputfield.h @@ -38,12 +38,12 @@ class DateInputField : public SimpleInputField DateInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( TQDate ); diff --git a/kode/kwsdl/kung/doubleinputfield.cpp b/kode/kwsdl/kung/doubleinputfield.cpp index d1ffdd27..78f73bcd 100644 --- a/kode/kwsdl/kung/doubleinputfield.cpp +++ b/kode/kwsdl/kung/doubleinputfield.cpp @@ -41,14 +41,14 @@ void DoubleInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void DoubleInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void DoubleInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:" + mTypeName ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void DoubleInputField::setData( const TQString &data ) @@ -61,9 +61,9 @@ TQString DoubleInputField::data() const return TQString::number( mValue ); } -TQWidget *DoubleInputField::createWidget( TQWidget *tqparent ) +TQWidget *DoubleInputField::createWidget( TQWidget *parent ) { - mInputWidget = new KDoubleSpinBox( tqparent ); + mInputWidget = new KDoubleSpinBox( parent ); if ( mType ) { if ( mType->facetType() & Schema::SimpleType::MININC ) diff --git a/kode/kwsdl/kung/doubleinputfield.h b/kode/kwsdl/kung/doubleinputfield.h index 78f72cd6..93f3a012 100644 --- a/kode/kwsdl/kung/doubleinputfield.h +++ b/kode/kwsdl/kung/doubleinputfield.h @@ -37,12 +37,12 @@ class DoubleInputField : public SimpleInputField DoubleInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( double ); diff --git a/kode/kwsdl/kung/enuminputfield.cpp b/kode/kwsdl/kung/enuminputfield.cpp index 5d3fcf08..f290803b 100644 --- a/kode/kwsdl/kung/enuminputfield.cpp +++ b/kode/kwsdl/kung/enuminputfield.cpp @@ -43,14 +43,14 @@ void EnumInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void EnumInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void EnumInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:string" ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void EnumInputField::setData( const TQString &data ) @@ -63,9 +63,9 @@ TQString EnumInputField::data() const return mValue; } -TQWidget *EnumInputField::createWidget( TQWidget *tqparent ) +TQWidget *EnumInputField::createWidget( TQWidget *parent ) { - mInputWidget = new KComboBox( tqparent ); + mInputWidget = new KComboBox( parent ); mInputWidget->insertStringList( mEnums ); mInputWidget->setCurrentItem( mEnums.findIndex( mValue ) ); diff --git a/kode/kwsdl/kung/enuminputfield.h b/kode/kwsdl/kung/enuminputfield.h index 91d2b19f..36bb101f 100644 --- a/kode/kwsdl/kung/enuminputfield.h +++ b/kode/kwsdl/kung/enuminputfield.h @@ -37,12 +37,12 @@ class EnumInputField : public SimpleInputField EnumInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( int ); diff --git a/kode/kwsdl/kung/inputdialog.cpp b/kode/kwsdl/kung/inputdialog.cpp index dc1a711c..17aa601b 100644 --- a/kode/kwsdl/kung/inputdialog.cpp +++ b/kode/kwsdl/kung/inputdialog.cpp @@ -23,8 +23,8 @@ #include "inputdialog.h" -InputDialog::InputDialog( TQWidget *page, TQWidget *tqparent ) - : KDialogBase( Swallow, "", Ok | Cancel, Ok, tqparent, "", true, true ) +InputDialog::InputDialog( TQWidget *page, TQWidget *parent ) + : KDialogBase( Swallow, "", Ok | Cancel, Ok, parent, "", true, true ) { setMainWidget( page ); diff --git a/kode/kwsdl/kung/inputdialog.h b/kode/kwsdl/kung/inputdialog.h index fbefe4d1..b592545b 100644 --- a/kode/kwsdl/kung/inputdialog.h +++ b/kode/kwsdl/kung/inputdialog.h @@ -27,7 +27,7 @@ class InputDialog : public KDialogBase { public: - InputDialog( TQWidget *page, TQWidget *tqparent ); + InputDialog( TQWidget *page, TQWidget *parent ); }; #endif diff --git a/kode/kwsdl/kung/inputfield.h b/kode/kwsdl/kung/inputfield.h index 100cc4bb..4b05044b 100644 --- a/kode/kwsdl/kung/inputfield.h +++ b/kode/kwsdl/kung/inputfield.h @@ -68,7 +68,7 @@ class InputField : public TQObject /** Returns the xml value of this field. */ - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ) = 0; + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ) = 0; /** Sets the plain data of this field as string. @@ -84,7 +84,7 @@ class InputField : public TQObject Returns a pointer to a new created input widget which can be used to to modify the value. */ - virtual TQWidget *createWidget( TQWidget *tqparent ) = 0; + virtual TQWidget *createWidget( TQWidget *parent ) = 0; /** Add a child field. diff --git a/kode/kwsdl/kung/integerinputfield.cpp b/kode/kwsdl/kung/integerinputfield.cpp index 9db5c40a..022ec0d8 100644 --- a/kode/kwsdl/kung/integerinputfield.cpp +++ b/kode/kwsdl/kung/integerinputfield.cpp @@ -43,14 +43,14 @@ void IntegerInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void IntegerInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void IntegerInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:" + mTypeName ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void IntegerInputField::setData( const TQString &data ) @@ -63,9 +63,9 @@ TQString IntegerInputField::data() const return TQString::number( mValue ); } -TQWidget *IntegerInputField::createWidget( TQWidget *tqparent ) +TQWidget *IntegerInputField::createWidget( TQWidget *parent ) { - mInputWidget = new KIntSpinBox( tqparent ); + mInputWidget = new KIntSpinBox( parent ); // basic restrictions if ( mTypeName == "byte" ) { diff --git a/kode/kwsdl/kung/integerinputfield.h b/kode/kwsdl/kung/integerinputfield.h index bf6e61ed..2ffeb1ec 100644 --- a/kode/kwsdl/kung/integerinputfield.h +++ b/kode/kwsdl/kung/integerinputfield.h @@ -37,12 +37,12 @@ class IntegerInputField : public SimpleInputField IntegerInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( int ); diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp index 409eaf10..7a5eeb71 100644 --- a/kode/kwsdl/kung/listinputfield.cpp +++ b/kode/kwsdl/kung/listinputfield.cpp @@ -62,11 +62,11 @@ void ListInputField::setXMLData( const TQDomElement &element ) } } -void ListInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void ListInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { InputField::List::Iterator it; for ( it = mFields.begin(); it != mFields.end(); ++it ) { - (*it)->xmlData( document, tqparent ); + (*it)->xmlData( document, parent ); } } @@ -79,16 +79,16 @@ TQString ListInputField::data() const return TQString(); } -TQWidget *ListInputField::createWidget( TQWidget *tqparent ) +TQWidget *ListInputField::createWidget( TQWidget *parent ) { - mInputWidget = new ListWidget( this, name(), mTypeName, tqparent ); + mInputWidget = new ListWidget( this, name(), mTypeName, parent ); return mInputWidget; } -ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *tqparent ) - : TQWidget( tqparent ), +ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *parent ) + : TQWidget( parent ), mParentField( parentField ), mName( name ), mType( type ) { TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 ); diff --git a/kode/kwsdl/kung/listinputfield.h b/kode/kwsdl/kung/listinputfield.h index 82940370..1d48cc6a 100644 --- a/kode/kwsdl/kung/listinputfield.h +++ b/kode/kwsdl/kung/listinputfield.h @@ -39,12 +39,12 @@ class ListInputField : public SimpleInputField ListInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private: ListWidget *mInputWidget; @@ -57,7 +57,7 @@ class ListWidget : public TQWidget TQ_OBJECT public: - ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *tqparent ); + ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *parent ); void update(); diff --git a/kode/kwsdl/kung/outputdialog.cpp b/kode/kwsdl/kung/outputdialog.cpp index bef2cd2f..6cdb7e57 100644 --- a/kode/kwsdl/kung/outputdialog.cpp +++ b/kode/kwsdl/kung/outputdialog.cpp @@ -23,8 +23,8 @@ #include "outputdialog.h" -OutputDialog::OutputDialog( TQWidget *page, TQWidget *tqparent ) - : KDialogBase( Swallow, "", Ok, Ok, tqparent, "", true, true ) +OutputDialog::OutputDialog( TQWidget *page, TQWidget *parent ) + : KDialogBase( Swallow, "", Ok, Ok, parent, "", true, true ) { setMainWidget( page ); } diff --git a/kode/kwsdl/kung/outputdialog.h b/kode/kwsdl/kung/outputdialog.h index bab04320..a3c55878 100644 --- a/kode/kwsdl/kung/outputdialog.h +++ b/kode/kwsdl/kung/outputdialog.h @@ -27,7 +27,7 @@ class OutputDialog : public KDialogBase { public: - OutputDialog( TQWidget *page, TQWidget *tqparent ); + OutputDialog( TQWidget *page, TQWidget *parent ); }; #endif diff --git a/kode/kwsdl/kung/pageinputfield.cpp b/kode/kwsdl/kung/pageinputfield.cpp index d7e5639b..6ca3409d 100644 --- a/kode/kwsdl/kung/pageinputfield.cpp +++ b/kode/kwsdl/kung/pageinputfield.cpp @@ -65,7 +65,7 @@ void PageInputField::setXMLData( const TQDomElement &element ) } } -void PageInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void PageInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( "ns1:" + mName ); @@ -73,7 +73,7 @@ void PageInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) for ( it = mFields.begin(); it != mFields.end(); ++it ) (*it)->xmlData( document, element ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void PageInputField::setData( const TQString& ) @@ -85,9 +85,9 @@ TQString PageInputField::data() const return TQString(); } -TQWidget *PageInputField::createWidget( TQWidget *tqparent ) +TQWidget *PageInputField::createWidget( TQWidget *parent ) { - TQWidget *mInputWidget = new TQWidget( tqparent, "PageInputWidget" ); + TQWidget *mInputWidget = new TQWidget( parent, "PageInputWidget" ); TQGridLayout *tqlayout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 ); InputField::List::Iterator it; diff --git a/kode/kwsdl/kung/pageinputfield.h b/kode/kwsdl/kung/pageinputfield.h index 05321c31..22d5fdc0 100644 --- a/kode/kwsdl/kung/pageinputfield.h +++ b/kode/kwsdl/kung/pageinputfield.h @@ -37,12 +37,12 @@ class PageInputField : public InputField PageInputField( const TQString &name, const KWSDL::Message &message ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private: TQWidget *mInputWidget; diff --git a/kode/kwsdl/kung/simplebaseinputfield.cpp b/kode/kwsdl/kung/simplebaseinputfield.cpp index bd2aa90e..0198723c 100644 --- a/kode/kwsdl/kung/simplebaseinputfield.cpp +++ b/kode/kwsdl/kung/simplebaseinputfield.cpp @@ -59,14 +59,14 @@ void SimpleBaseInputField::setXMLData( const TQDomElement &element ) } } -void SimpleBaseInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void SimpleBaseInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { if ( mType->subType() == Schema::SimpleType::TypeRestriction ) { InputField *field = mFields.first(); if ( !field ) { qDebug( "SimpleBaseInputField: No child found" ); } else { - field->xmlData( document, tqparent ); + field->xmlData( document, parent ); } } else { qDebug( "SimpleBaseInputField: Unsupported subtype" ); @@ -103,7 +103,7 @@ TQString SimpleBaseInputField::data() const return TQString(); } -TQWidget *SimpleBaseInputField::createWidget( TQWidget *tqparent ) +TQWidget *SimpleBaseInputField::createWidget( TQWidget *parent ) { if ( mType->subType() == Schema::SimpleType::TypeRestriction ) { InputField *field = mFields.first(); @@ -111,7 +111,7 @@ TQWidget *SimpleBaseInputField::createWidget( TQWidget *tqparent ) qDebug( "SimpleBaseInputField: No child found" ); return 0; } else { - return field->createWidget( tqparent ); + return field->createWidget( parent ); } } else { qDebug( "SimpleBaseInputField: Unsupported subtype" ); diff --git a/kode/kwsdl/kung/simplebaseinputfield.h b/kode/kwsdl/kung/simplebaseinputfield.h index aa52bc08..dab7e906 100644 --- a/kode/kwsdl/kung/simplebaseinputfield.h +++ b/kode/kwsdl/kung/simplebaseinputfield.h @@ -30,12 +30,12 @@ class SimpleBaseInputField : public SimpleInputField SimpleBaseInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); }; #endif diff --git a/kode/kwsdl/kung/stringinputfield.cpp b/kode/kwsdl/kung/stringinputfield.cpp index 6f1bc4f7..390c5bc1 100644 --- a/kode/kwsdl/kung/stringinputfield.cpp +++ b/kode/kwsdl/kung/stringinputfield.cpp @@ -42,14 +42,14 @@ void StringInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void StringInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void StringInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:" + mTypeName ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void StringInputField::setData( const TQString &data ) @@ -62,9 +62,9 @@ TQString StringInputField::data() const return mValue; } -TQWidget *StringInputField::createWidget( TQWidget *tqparent ) +TQWidget *StringInputField::createWidget( TQWidget *parent ) { - mInputWidget = new TQLineEdit( tqparent ); + mInputWidget = new TQLineEdit( parent ); if ( mType ) { if ( mType->facetType() & Schema::SimpleType::LENGTH ) // TODO: using TQValidator here? diff --git a/kode/kwsdl/kung/stringinputfield.h b/kode/kwsdl/kung/stringinputfield.h index cd53a9b1..7bfc4124 100644 --- a/kode/kwsdl/kung/stringinputfield.h +++ b/kode/kwsdl/kung/stringinputfield.h @@ -37,12 +37,12 @@ class StringInputField : public SimpleInputField StringInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( const TQString& ); diff --git a/kode/kwsdl/kung/timeinputfield.cpp b/kode/kwsdl/kung/timeinputfield.cpp index 29b89fca..dce73bdd 100644 --- a/kode/kwsdl/kung/timeinputfield.cpp +++ b/kode/kwsdl/kung/timeinputfield.cpp @@ -39,14 +39,14 @@ void TimeInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void TimeInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) +void TimeInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:time" ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void TimeInputField::setData( const TQString &data ) @@ -59,9 +59,9 @@ TQString TimeInputField::data() const return mValue.toString( TQt::ISODate ); } -TQWidget *TimeInputField::createWidget( TQWidget *tqparent ) +TQWidget *TimeInputField::createWidget( TQWidget *parent ) { - mInputWidget = new KTimeWidget( tqparent ); + mInputWidget = new KTimeWidget( parent ); mInputWidget->setTime( mValue ); diff --git a/kode/kwsdl/kung/timeinputfield.h b/kode/kwsdl/kung/timeinputfield.h index f3b14c9d..30d219ae 100644 --- a/kode/kwsdl/kung/timeinputfield.h +++ b/kode/kwsdl/kung/timeinputfield.h @@ -38,12 +38,12 @@ class TimeInputField : public SimpleInputField TimeInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *tqparent ); + virtual TQWidget *createWidget( TQWidget *parent ); private slots: void inputChanged( const TQTime& ); diff --git a/kode/kwsdl/parser.cpp b/kode/kwsdl/parser.cpp index 6e2a37dc..49f77eca 100644 --- a/kode/kwsdl/parser.cpp +++ b/kode/kwsdl/parser.cpp @@ -94,9 +94,9 @@ void Parser::parse( const TQDomElement &root ) } } -void Parser::parseTypes( const TQDomElement &tqparent ) +void Parser::parseTypes( const TQDomElement &parent ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -108,9 +108,9 @@ void Parser::parseTypes( const TQDomElement &tqparent ) } } -void Parser::parseMessage( const TQDomElement &tqparent, Message &message ) +void Parser::parseMessage( const TQDomElement &parent, Message &message ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -130,9 +130,9 @@ void Parser::parseMessage( const TQDomElement &tqparent, Message &message ) } } -void Parser::parsePortType( const TQDomElement &tqparent, Port &port ) +void Parser::parsePortType( const TQDomElement &parent, Port &port ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -161,11 +161,11 @@ void Parser::parsePortType( const TQDomElement &tqparent, Port &port ) } } -void Parser::parseBinding( const TQDomElement &tqparent ) +void Parser::parseBinding( const TQDomElement &parent ) { - Binding binding( sns( tqparent.attribute( "name" ) ), sns( tqparent.attribute( "type" ) ) ); + Binding binding( sns( parent.attribute( "name" ) ), sns( parent.attribute( "type" ) ) ); - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -216,9 +216,9 @@ void Parser::parseBinding( const TQDomElement &tqparent ) mBindings.append( binding ); } -void Parser::parseService( const TQDomElement &tqparent ) +void Parser::parseService( const TQDomElement &parent ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { diff --git a/kode/kwsdl/schema/parser.cpp b/kode/kwsdl/schema/parser.cpp index 14859975..7ec3804f 100644 --- a/kode/kwsdl/schema/parser.cpp +++ b/kode/kwsdl/schema/parser.cpp @@ -446,7 +446,7 @@ void Parser::addElement( const TQDomElement &element, ComplexType *cType ) && ct->elementName( 0 ) == "any" ) { // if the complex type is then we dont need a type for it. - // make the tqparent's type as XSDType::ANY + // make the parent's type as XSDType::ANY delete ct; type_id = XSDType::ANY; } else { diff --git a/kode/kwsdl/tests/google/serializer.cpp b/kode/kwsdl/tests/google/serializer.cpp index 281f3269..5416b707 100644 --- a/kode/kwsdl/tests/google/serializer.cpp +++ b/kode/kwsdl/tests/google/serializer.cpp @@ -41,12 +41,12 @@ void Serializer::demarshalValue( const TQString &str, TQString *value ) *value = str; } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQString* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQString* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:string" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, TQString* value ) @@ -64,12 +64,12 @@ void Serializer::demarshalValue( const TQString &str, bool *value ) *value = (str.lower() == "true" ? true : false); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const bool* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const bool* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:boolean" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, bool* value ) @@ -87,12 +87,12 @@ void Serializer::demarshalValue( const TQString &str, float *value ) *value = str.toFloat(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const float* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const float* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:TODO" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, float* value ) @@ -110,12 +110,12 @@ void Serializer::demarshalValue( const TQString &str, int *value ) *value = str.toInt(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const int* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const int* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:int" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, int* value ) @@ -133,12 +133,12 @@ void Serializer::demarshalValue( const TQString &str, unsigned int *value ) *value = str.toUInt(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned int* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned int* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:unsignedByte" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, unsigned int* value ) @@ -156,12 +156,12 @@ void Serializer::demarshalValue( const TQString &str, double *value ) *value = str.toDouble(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const double* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const double* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:double" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, double* value ) @@ -179,12 +179,12 @@ void Serializer::demarshalValue( const TQString &str, char *value ) *value = str[ 0 ].latin1(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const char* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const char* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:byte" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, char* value ) @@ -202,12 +202,12 @@ void Serializer::demarshalValue( const TQString &str, unsigned char *value ) *value = str[ 0 ].latin1(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned char* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned char* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:unsignedByte" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, unsigned char* value ) @@ -225,12 +225,12 @@ void Serializer::demarshalValue( const TQString &str, short *value ) *value = str.toShort(); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const short* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const short* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:short" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, short* value ) @@ -248,12 +248,12 @@ void Serializer::demarshalValue( const TQString &str, TQByteArray *value ) *value = KCodecs::base64Decode( str.utf8() ); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQByteArray* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQByteArray* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:base64Binary" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, TQByteArray* value ) @@ -271,12 +271,12 @@ void Serializer::demarshalValue( const TQString &str, TQDateTime *value ) *value = TQDateTime::fromString( str, TQt::ISODate ); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDateTime* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDateTime* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:dateTime" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, TQDateTime* value ) @@ -294,12 +294,12 @@ void Serializer::demarshalValue( const TQString &str, TQDate *value ) *value = TQDate::fromString( str, TQt::ISODate ); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDate* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDate* value ) { TQDomElement element = doc.createElement( name ); element.setAttribute( "xsi:type", "xsd:date" ); element.appendChild( doc.createTextNode( Serializer::marshalValue( value ) ) ); - tqparent.appendChild( element ); + parent.appendChild( element ); } void Serializer::demarshal( const TQDomElement &element, TQDate* value ) @@ -307,11 +307,11 @@ void Serializer::demarshal( const TQDomElement &element, TQDate* value ) Serializer::demarshalValue( element.text(), value ); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElementArray* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElementArray* value ) { TQDomElement root = doc.createElement( name ); root.setAttribute( "xsi:type", "ns1:ResultElementArray" ); - tqparent.appendChild( root ); + parent.appendChild( root ); if ( value->items() ) { const TQPtrList* list = value->items(); @@ -319,7 +319,7 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt element.setAttribute( "xmlns:ns1", "http://schemas.xmlsoap.org/soap/encoding/" ); element.setAttribute( "xsi:type", "ns1:Array" ); element.setAttribute( "ns1:arrayType", "ns1:ResultElement[" + TQString::number( list->count() ) + "]" ); - tqparent.appendChild( element ); + parent.appendChild( element ); TQPtrListIterator it( *list ); while ( it.current() != 0 ) { @@ -329,11 +329,11 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt } } -void Serializer::demarshal( const TQDomElement &tqparent, ResultElementArray* value ) +void Serializer::demarshal( const TQDomElement &parent, ResultElementArray* value ) { TQPtrList* itemsList = new TQPtrList(); itemsList->setAutoDelete( true ); - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -349,11 +349,11 @@ void Serializer::demarshal( const TQDomElement &tqparent, ResultElementArray* va value->setItems( itemsList ); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategoryArray* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategoryArray* value ) { TQDomElement root = doc.createElement( name ); root.setAttribute( "xsi:type", "ns1:DirectoryCategoryArray" ); - tqparent.appendChild( root ); + parent.appendChild( root ); if ( value->items() ) { const TQPtrList* list = value->items(); @@ -361,7 +361,7 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt element.setAttribute( "xmlns:ns1", "http://schemas.xmlsoap.org/soap/encoding/" ); element.setAttribute( "xsi:type", "ns1:Array" ); element.setAttribute( "ns1:arrayType", "ns1:DirectoryCategory[" + TQString::number( list->count() ) + "]" ); - tqparent.appendChild( element ); + parent.appendChild( element ); TQPtrListIterator it( *list ); while ( it.current() != 0 ) { @@ -371,11 +371,11 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt } } -void Serializer::demarshal( const TQDomElement &tqparent, DirectoryCategoryArray* value ) +void Serializer::demarshal( const TQDomElement &parent, DirectoryCategoryArray* value ) { TQPtrList* itemsList = new TQPtrList(); itemsList->setAutoDelete( true ); - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -391,11 +391,11 @@ void Serializer::demarshal( const TQDomElement &tqparent, DirectoryCategoryArray value->setItems( itemsList ); } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const GoogleSearchResult* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const GoogleSearchResult* value ) { TQDomElement root = doc.createElement( name ); root.setAttribute( "xsi:type", "ns1:GoogleSearchResult" ); - tqparent.appendChild( root ); + parent.appendChild( root ); if ( value->documentFiltering() ) { Serializer::marshal( doc, root, "documentFiltering", value->documentFiltering() ); } @@ -431,9 +431,9 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt } } -void Serializer::demarshal( const TQDomElement &tqparent, GoogleSearchResult* value ) +void Serializer::demarshal( const TQDomElement &parent, GoogleSearchResult* value ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -498,11 +498,11 @@ void Serializer::demarshal( const TQDomElement &tqparent, GoogleSearchResult* va } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategory* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategory* value ) { TQDomElement root = doc.createElement( name ); root.setAttribute( "xsi:type", "ns1:DirectoryCategory" ); - tqparent.appendChild( root ); + parent.appendChild( root ); if ( value->fullViewableName() ) { Serializer::marshal( doc, root, "fullViewableName", value->fullViewableName() ); } @@ -511,9 +511,9 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt } } -void Serializer::demarshal( const TQDomElement &tqparent, DirectoryCategory* value ) +void Serializer::demarshal( const TQDomElement &parent, DirectoryCategory* value ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { @@ -533,11 +533,11 @@ void Serializer::demarshal( const TQDomElement &tqparent, DirectoryCategory* val } -void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElement* value ) +void Serializer::marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElement* value ) { TQDomElement root = doc.createElement( name ); root.setAttribute( "xsi:type", "ns1:ResultElement" ); - tqparent.appendChild( root ); + parent.appendChild( root ); if ( value->summary() ) { Serializer::marshal( doc, root, "summary", value->summary() ); } @@ -567,9 +567,9 @@ void Serializer::marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQSt } } -void Serializer::demarshal( const TQDomElement &tqparent, ResultElement* value ) +void Serializer::demarshal( const TQDomElement &parent, ResultElement* value ) { - TQDomNode node = tqparent.firstChild(); + TQDomNode node = parent.firstChild(); while ( !node.isNull() ) { TQDomElement element = node.toElement(); if ( !element.isNull() ) { diff --git a/kode/kwsdl/tests/google/serializer.h b/kode/kwsdl/tests/google/serializer.h index 4b5ff192..4519685c 100644 --- a/kode/kwsdl/tests/google/serializer.h +++ b/kode/kwsdl/tests/google/serializer.h @@ -41,62 +41,62 @@ class Serializer public: static TQString marshalValue( const TQString* value ); static void demarshalValue( const TQString &str, TQString *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQString* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQString* value ); static void demarshal( const TQDomElement &element, TQString* value ); static TQString marshalValue( const bool* value ); static void demarshalValue( const TQString &str, bool *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const bool* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const bool* value ); static void demarshal( const TQDomElement &element, bool* value ); static TQString marshalValue( const float* value ); static void demarshalValue( const TQString &str, float *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const float* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const float* value ); static void demarshal( const TQDomElement &element, float* value ); static TQString marshalValue( const int* value ); static void demarshalValue( const TQString &str, int *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const int* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const int* value ); static void demarshal( const TQDomElement &element, int* value ); static TQString marshalValue( const unsigned int* value ); static void demarshalValue( const TQString &str, unsigned int *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned int* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned int* value ); static void demarshal( const TQDomElement &element, unsigned int* value ); static TQString marshalValue( const double* value ); static void demarshalValue( const TQString &str, double *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const double* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const double* value ); static void demarshal( const TQDomElement &element, double* value ); static TQString marshalValue( const char* value ); static void demarshalValue( const TQString &str, char *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const char* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const char* value ); static void demarshal( const TQDomElement &element, char* value ); static TQString marshalValue( const unsigned char* value ); static void demarshalValue( const TQString &str, unsigned char *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const unsigned char* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const unsigned char* value ); static void demarshal( const TQDomElement &element, unsigned char* value ); static TQString marshalValue( const short* value ); static void demarshalValue( const TQString &str, short *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const short* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const short* value ); static void demarshal( const TQDomElement &element, short* value ); static TQString marshalValue( const TQByteArray* value ); static void demarshalValue( const TQString &str, TQByteArray *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQByteArray* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQByteArray* value ); static void demarshal( const TQDomElement &element, TQByteArray* value ); static TQString marshalValue( const TQDateTime* value ); static void demarshalValue( const TQString &str, TQDateTime *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDateTime* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDateTime* value ); static void demarshal( const TQDomElement &element, TQDateTime* value ); static TQString marshalValue( const TQDate* value ); static void demarshalValue( const TQString &str, TQDate *value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const TQDate* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const TQDate* value ); static void demarshal( const TQDomElement &element, TQDate* value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElementArray* value ); - static void demarshal( const TQDomElement &tqparent, ResultElementArray* value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategoryArray* value ); - static void demarshal( const TQDomElement &tqparent, DirectoryCategoryArray* value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const GoogleSearchResult* value ); - static void demarshal( const TQDomElement &tqparent, GoogleSearchResult* value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const DirectoryCategory* value ); - static void demarshal( const TQDomElement &tqparent, DirectoryCategory* value ); - static void marshal( TQDomDocument &doc, TQDomElement &tqparent, const TQString &name, const ResultElement* value ); - static void demarshal( const TQDomElement &tqparent, ResultElement* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElementArray* value ); + static void demarshal( const TQDomElement &parent, ResultElementArray* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategoryArray* value ); + static void demarshal( const TQDomElement &parent, DirectoryCategoryArray* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const GoogleSearchResult* value ); + static void demarshal( const TQDomElement &parent, GoogleSearchResult* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const DirectoryCategory* value ); + static void demarshal( const TQDomElement &parent, DirectoryCategory* value ); + static void marshal( TQDomDocument &doc, TQDomElement &parent, const TQString &name, const ResultElement* value ); + static void demarshal( const TQDomElement &parent, ResultElement* value ); }; -- cgit v1.2.3