From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kode/kwsdl/kung/binaryinputfield.cpp | 14 +++++++------- kode/kwsdl/kung/binaryinputfield.h | 10 ++++++---- kode/kwsdl/kung/boolinputfield.cpp | 8 ++++---- kode/kwsdl/kung/boolinputfield.h | 5 +++-- kode/kwsdl/kung/complexbaseinputfield.cpp | 10 +++++----- kode/kwsdl/kung/complexbaseinputfield.h | 4 ++-- kode/kwsdl/kung/dateinputfield.cpp | 12 ++++++------ kode/kwsdl/kung/dateinputfield.h | 5 +++-- kode/kwsdl/kung/dispatcher.h | 3 ++- kode/kwsdl/kung/doubleinputfield.cpp | 8 ++++---- kode/kwsdl/kung/doubleinputfield.h | 5 +++-- kode/kwsdl/kung/enuminputfield.cpp | 8 ++++---- kode/kwsdl/kung/enuminputfield.h | 5 +++-- kode/kwsdl/kung/inputdialog.cpp | 4 ++-- kode/kwsdl/kung/inputdialog.h | 2 +- kode/kwsdl/kung/inputfield.h | 7 ++++--- kode/kwsdl/kung/integerinputfield.cpp | 8 ++++---- kode/kwsdl/kung/integerinputfield.h | 5 +++-- kode/kwsdl/kung/listinputfield.cpp | 14 +++++++------- kode/kwsdl/kung/listinputfield.h | 10 ++++++---- kode/kwsdl/kung/loader.h | 3 ++- kode/kwsdl/kung/outputdialog.cpp | 4 ++-- kode/kwsdl/kung/outputdialog.h | 2 +- kode/kwsdl/kung/pageinputfield.cpp | 10 +++++----- kode/kwsdl/kung/pageinputfield.h | 5 +++-- kode/kwsdl/kung/simplebaseinputfield.cpp | 8 ++++---- kode/kwsdl/kung/simplebaseinputfield.h | 4 ++-- kode/kwsdl/kung/stringinputfield.cpp | 8 ++++---- kode/kwsdl/kung/stringinputfield.h | 5 +++-- kode/kwsdl/kung/timeinputfield.cpp | 12 ++++++------ kode/kwsdl/kung/timeinputfield.h | 5 +++-- kode/kwsdl/kung/transport.h | 3 ++- 32 files changed, 116 insertions(+), 100 deletions(-) (limited to 'kode/kwsdl/kung') diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index 56643b3d2..f517c7af8 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 &parent ) +void BinaryInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:" + mTypeName ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - parent.appendChild( element ); + tqparent.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 *parent ) +TQWidget *BinaryInputField::createWidget( TQWidget *tqparent ) { - mInputWidget = new BinaryWidget( parent ); + mInputWidget = new BinaryWidget( tqparent ); if ( !mValue.isEmpty() ) mInputWidget->setData( mValue ); @@ -94,8 +94,8 @@ void BinaryInputField::valueChanged( const TQByteArray &value ) } -BinaryWidget::BinaryWidget( TQWidget *parent ) - : TQWidget( parent, "BinaryWidget" ), +BinaryWidget::BinaryWidget( TQWidget *tqparent ) + : TQWidget( tqparent, "BinaryWidget" ), mMainWidget( 0 ) { mLayout = new TQGridLayout( this, 3, 2, 11, 6 ); @@ -123,7 +123,7 @@ void BinaryWidget::setData( const TQByteArray &data ) mimetype = result->mimeType(); if ( !mimetype.isEmpty() ) { - KParts::ReadOnlyPart *part = KParts::ComponentFactory::createPartInstanceFromQuery( mimetype, TQString::null, this, 0, this, 0 ); + KParts::ReadOnlyPart *part = KParts::ComponentFactory::createPartInstanceFromQuery( mimetype, TQString(), this, 0, this, 0 ); if ( part ) { KTempFile file; file.file()->writeBlock( data ); diff --git a/kode/kwsdl/kung/binaryinputfield.h b/kode/kwsdl/kung/binaryinputfield.h index e38938016..ad586f5d9 100644 --- a/kode/kwsdl/kung/binaryinputfield.h +++ b/kode/kwsdl/kung/binaryinputfield.h @@ -33,17 +33,18 @@ class TQPushButton; class BinaryInputField : public SimpleInputField { Q_OBJECT + TQ_OBJECT public: BinaryInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *parent ); + virtual TQWidget *createWidget( TQWidget *tqparent ); private slots: void valueChanged( const TQByteArray &value ); @@ -55,12 +56,13 @@ class BinaryInputField : public SimpleInputField TQString mTypeName; }; -class BinaryWidget : public QWidget +class BinaryWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - BinaryWidget( TQWidget *parent ); + BinaryWidget( TQWidget *tqparent ); void setData( const TQByteArray &data ); diff --git a/kode/kwsdl/kung/boolinputfield.cpp b/kode/kwsdl/kung/boolinputfield.cpp index e3eb3eef1..c05df02b1 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 &parent ) +void BoolInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:boolean" ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - parent.appendChild( element ); + tqparent.appendChild( element ); } void BoolInputField::setData( const TQString &data ) @@ -59,9 +59,9 @@ TQString BoolInputField::data() const return ( mValue ? "true" : "false" ); } -TQWidget *BoolInputField::createWidget( TQWidget *parent ) +TQWidget *BoolInputField::createWidget( TQWidget *tqparent ) { - mInputWidget = new TQCheckBox( parent ); + mInputWidget = new TQCheckBox( tqparent ); mInputWidget->setChecked( mValue ); diff --git a/kode/kwsdl/kung/boolinputfield.h b/kode/kwsdl/kung/boolinputfield.h index 6ec98c86a..c48ca96be 100644 --- a/kode/kwsdl/kung/boolinputfield.h +++ b/kode/kwsdl/kung/boolinputfield.h @@ -31,17 +31,18 @@ class TQCheckBox; class BoolInputField : public SimpleInputField { Q_OBJECT + TQ_OBJECT public: BoolInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *parent ); + virtual TQWidget *createWidget( TQWidget *tqparent ); private slots: void inputChanged( bool ); diff --git a/kode/kwsdl/kung/complexbaseinputfield.cpp b/kode/kwsdl/kung/complexbaseinputfield.cpp index 1c43bd952..30662690b 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 &parent ) +void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) { TQDomElement element = document.createElement( mName ); @@ -125,7 +125,7 @@ void ComplexBaseInputField::xmlData( TQDomDocument &document, TQDomElement &pare } } - parent.appendChild( element ); + tqparent.appendChild( element ); } void ComplexBaseInputField::setData( const TQString& ) @@ -137,10 +137,10 @@ TQString ComplexBaseInputField::data() const return TQString(); } -TQWidget *ComplexBaseInputField::createWidget( TQWidget *parent ) +TQWidget *ComplexBaseInputField::createWidget( TQWidget *tqparent ) { - TQGroupBox *inputWidget = new TQGroupBox( mName, parent ); - inputWidget->setColumnLayout( 0, Qt::Horizontal ); + TQGroupBox *inputWidget = new TQGroupBox( mName, tqparent ); + inputWidget->setColumnLayout( 0, TQt::Horizontal ); TQGridLayout *tqlayout = new TQGridLayout( inputWidget->tqlayout(), 2, 2, 6 ); InputField::List::Iterator it; diff --git a/kode/kwsdl/kung/complexbaseinputfield.h b/kode/kwsdl/kung/complexbaseinputfield.h index 9fc47dbc7..f47c6d044 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 &parent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *parent ); + virtual TQWidget *createWidget( TQWidget *tqparent ); }; #endif diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp index 8d5c329cc..ffb9af7a1 100644 --- a/kode/kwsdl/kung/dateinputfield.cpp +++ b/kode/kwsdl/kung/dateinputfield.cpp @@ -39,29 +39,29 @@ void DateInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void DateInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) +void DateInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:date" ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - parent.appendChild( element ); + tqparent.appendChild( element ); } void DateInputField::setData( const TQString &data ) { - mValue = TQDate::fromString( data, Qt::ISODate ); + mValue = TQDate::fromString( data, TQt::ISODate ); } TQString DateInputField::data() const { - return mValue.toString( Qt::ISODate ); + return mValue.toString( TQt::ISODate ); } -TQWidget *DateInputField::createWidget( TQWidget *parent ) +TQWidget *DateInputField::createWidget( TQWidget *tqparent ) { - mInputWidget = new KDatePicker( parent ); + mInputWidget = new KDatePicker( tqparent ); mInputWidget->setDate( mValue ); diff --git a/kode/kwsdl/kung/dateinputfield.h b/kode/kwsdl/kung/dateinputfield.h index 28efe5e33..8dcd0f89f 100644 --- a/kode/kwsdl/kung/dateinputfield.h +++ b/kode/kwsdl/kung/dateinputfield.h @@ -32,17 +32,18 @@ class KDatePicker; class DateInputField : public SimpleInputField { Q_OBJECT + TQ_OBJECT public: DateInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *parent ); + virtual TQWidget *createWidget( TQWidget *tqparent ); private slots: void inputChanged( TQDate ); diff --git a/kode/kwsdl/kung/dispatcher.h b/kode/kwsdl/kung/dispatcher.h index c770fe777..5b57f2c94 100644 --- a/kode/kwsdl/kung/dispatcher.h +++ b/kode/kwsdl/kung/dispatcher.h @@ -29,9 +29,10 @@ class ConversationManager; class Transport; -class Dispatcher : public QObject +class Dispatcher : public TQObject { Q_OBJECT + TQ_OBJECT public: Dispatcher(); diff --git a/kode/kwsdl/kung/doubleinputfield.cpp b/kode/kwsdl/kung/doubleinputfield.cpp index 78f73bcd6..d1ffdd277 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 &parent ) +void DoubleInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:" + mTypeName ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - parent.appendChild( element ); + tqparent.appendChild( element ); } void DoubleInputField::setData( const TQString &data ) @@ -61,9 +61,9 @@ TQString DoubleInputField::data() const return TQString::number( mValue ); } -TQWidget *DoubleInputField::createWidget( TQWidget *parent ) +TQWidget *DoubleInputField::createWidget( TQWidget *tqparent ) { - mInputWidget = new KDoubleSpinBox( parent ); + mInputWidget = new KDoubleSpinBox( tqparent ); if ( mType ) { if ( mType->facetType() & Schema::SimpleType::MININC ) diff --git a/kode/kwsdl/kung/doubleinputfield.h b/kode/kwsdl/kung/doubleinputfield.h index 61299a5cc..78f72cd6c 100644 --- a/kode/kwsdl/kung/doubleinputfield.h +++ b/kode/kwsdl/kung/doubleinputfield.h @@ -31,17 +31,18 @@ class KDoubleSpinBox; class DoubleInputField : public SimpleInputField { Q_OBJECT + TQ_OBJECT public: DoubleInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *parent ); + virtual TQWidget *createWidget( TQWidget *tqparent ); private slots: void inputChanged( double ); diff --git a/kode/kwsdl/kung/enuminputfield.cpp b/kode/kwsdl/kung/enuminputfield.cpp index f290803b6..5d3fcf087 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 &parent ) +void EnumInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:string" ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - parent.appendChild( element ); + tqparent.appendChild( element ); } void EnumInputField::setData( const TQString &data ) @@ -63,9 +63,9 @@ TQString EnumInputField::data() const return mValue; } -TQWidget *EnumInputField::createWidget( TQWidget *parent ) +TQWidget *EnumInputField::createWidget( TQWidget *tqparent ) { - mInputWidget = new KComboBox( parent ); + mInputWidget = new KComboBox( tqparent ); mInputWidget->insertStringList( mEnums ); mInputWidget->setCurrentItem( mEnums.findIndex( mValue ) ); diff --git a/kode/kwsdl/kung/enuminputfield.h b/kode/kwsdl/kung/enuminputfield.h index 14e360332..91d2b19fb 100644 --- a/kode/kwsdl/kung/enuminputfield.h +++ b/kode/kwsdl/kung/enuminputfield.h @@ -31,17 +31,18 @@ class KComboBox; class EnumInputField : public SimpleInputField { Q_OBJECT + TQ_OBJECT public: EnumInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *parent ); + virtual TQWidget *createWidget( TQWidget *tqparent ); private slots: void inputChanged( int ); diff --git a/kode/kwsdl/kung/inputdialog.cpp b/kode/kwsdl/kung/inputdialog.cpp index 17aa601b0..dc1a711c8 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 *parent ) - : KDialogBase( Swallow, "", Ok | Cancel, Ok, parent, "", true, true ) +InputDialog::InputDialog( TQWidget *page, TQWidget *tqparent ) + : KDialogBase( Swallow, "", Ok | Cancel, Ok, tqparent, "", true, true ) { setMainWidget( page ); diff --git a/kode/kwsdl/kung/inputdialog.h b/kode/kwsdl/kung/inputdialog.h index b592545b7..fbefe4d1a 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 *parent ); + InputDialog( TQWidget *page, TQWidget *tqparent ); }; #endif diff --git a/kode/kwsdl/kung/inputfield.h b/kode/kwsdl/kung/inputfield.h index 58b2d23bd..100cc4bb4 100644 --- a/kode/kwsdl/kung/inputfield.h +++ b/kode/kwsdl/kung/inputfield.h @@ -37,9 +37,10 @@ class ComplexType; /** Abstract base class for all kinds of input fields. */ -class InputField : public QObject +class InputField : public TQObject { Q_OBJECT + TQ_OBJECT public: typedef TQValueList List; @@ -67,7 +68,7 @@ class InputField : public QObject /** Returns the xml value of this field. */ - virtual void xmlData( TQDomDocument &document, TQDomElement &parent ) = 0; + virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ) = 0; /** Sets the plain data of this field as string. @@ -83,7 +84,7 @@ class InputField : public QObject Returns a pointer to a new created input widget which can be used to to modify the value. */ - virtual TQWidget *createWidget( TQWidget *parent ) = 0; + virtual TQWidget *createWidget( TQWidget *tqparent ) = 0; /** Add a child field. diff --git a/kode/kwsdl/kung/integerinputfield.cpp b/kode/kwsdl/kung/integerinputfield.cpp index 022ec0d84..9db5c40a8 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 &parent ) +void IntegerInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:" + mTypeName ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - parent.appendChild( element ); + tqparent.appendChild( element ); } void IntegerInputField::setData( const TQString &data ) @@ -63,9 +63,9 @@ TQString IntegerInputField::data() const return TQString::number( mValue ); } -TQWidget *IntegerInputField::createWidget( TQWidget *parent ) +TQWidget *IntegerInputField::createWidget( TQWidget *tqparent ) { - mInputWidget = new KIntSpinBox( parent ); + mInputWidget = new KIntSpinBox( tqparent ); // basic restrictions if ( mTypeName == "byte" ) { diff --git a/kode/kwsdl/kung/integerinputfield.h b/kode/kwsdl/kung/integerinputfield.h index 2cda162c6..bf6e61ed6 100644 --- a/kode/kwsdl/kung/integerinputfield.h +++ b/kode/kwsdl/kung/integerinputfield.h @@ -31,17 +31,18 @@ class KIntSpinBox; class IntegerInputField : public SimpleInputField { Q_OBJECT + TQ_OBJECT public: IntegerInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *parent ); + virtual TQWidget *createWidget( TQWidget *tqparent ); private slots: void inputChanged( int ); diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp index 7a5eeb713..a43f27b11 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 &parent ) +void ListInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) { InputField::List::Iterator it; for ( it = mFields.begin(); it != mFields.end(); ++it ) { - (*it)->xmlData( document, parent ); + (*it)->xmlData( document, tqparent ); } } @@ -79,17 +79,17 @@ TQString ListInputField::data() const return TQString(); } -TQWidget *ListInputField::createWidget( TQWidget *parent ) +TQWidget *ListInputField::createWidget( TQWidget *tqparent ) { - mInputWidget = new ListWidget( this, name(), mTypeName, parent ); + mInputWidget = new ListWidget( this, name(), mTypeName, tqparent ); return mInputWidget; } -ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *parent ) - : TQWidget( parent ), - mParentField( parentField ), mName( name ), mType( type ) +ListWidget::ListWidget( InputField *tqparentField, const TQString &name, const TQString &type, TQWidget *tqparent ) + : TQWidget( tqparent ), + mParentField( tqparentField ), 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 acf1e1c38..d36e091ce 100644 --- a/kode/kwsdl/kung/listinputfield.h +++ b/kode/kwsdl/kung/listinputfield.h @@ -33,29 +33,31 @@ class TQPushButton; class ListInputField : public SimpleInputField { Q_OBJECT + TQ_OBJECT public: ListInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *parent ); + virtual TQWidget *createWidget( TQWidget *tqparent ); private: ListWidget *mInputWidget; TQString mTypeName; }; -class ListWidget : public QWidget +class ListWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ListWidget( InputField *parentField, const TQString &name, const TQString &type, TQWidget *parent ); + ListWidget( InputField *tqparentField, const TQString &name, const TQString &type, TQWidget *tqparent ); void update(); diff --git a/kode/kwsdl/kung/loader.h b/kode/kwsdl/kung/loader.h index 7762e292a..d48d935cc 100644 --- a/kode/kwsdl/kung/loader.h +++ b/kode/kwsdl/kung/loader.h @@ -26,9 +26,10 @@ class Dispatcher; -class Loader : public QObject +class Loader : public TQObject { Q_OBJECT + TQ_OBJECT public: Loader(); diff --git a/kode/kwsdl/kung/outputdialog.cpp b/kode/kwsdl/kung/outputdialog.cpp index 6cdb7e579..bef2cd2fb 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 *parent ) - : KDialogBase( Swallow, "", Ok, Ok, parent, "", true, true ) +OutputDialog::OutputDialog( TQWidget *page, TQWidget *tqparent ) + : KDialogBase( Swallow, "", Ok, Ok, tqparent, "", true, true ) { setMainWidget( page ); } diff --git a/kode/kwsdl/kung/outputdialog.h b/kode/kwsdl/kung/outputdialog.h index a3c558789..bab043201 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 *parent ); + OutputDialog( TQWidget *page, TQWidget *tqparent ); }; #endif diff --git a/kode/kwsdl/kung/pageinputfield.cpp b/kode/kwsdl/kung/pageinputfield.cpp index 04f66ffa0..d7e5639b6 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 &parent ) +void PageInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) { TQDomElement element = document.createElement( "ns1:" + mName ); @@ -73,7 +73,7 @@ void PageInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) for ( it = mFields.begin(); it != mFields.end(); ++it ) (*it)->xmlData( document, element ); - parent.appendChild( element ); + tqparent.appendChild( element ); } void PageInputField::setData( const TQString& ) @@ -85,16 +85,16 @@ TQString PageInputField::data() const return TQString(); } -TQWidget *PageInputField::createWidget( TQWidget *parent ) +TQWidget *PageInputField::createWidget( TQWidget *tqparent ) { - TQWidget *mInputWidget = new TQWidget( parent, "PageInputWidget" ); + TQWidget *mInputWidget = new TQWidget( tqparent, "PageInputWidget" ); TQGridLayout *tqlayout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 ); InputField::List::Iterator it; int row = 0; for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) { TQLabel *label = new TQLabel( (*it)->name(), mInputWidget ); - label->tqsetAlignment( Qt::AlignTop ); + label->tqsetAlignment( TQt::AlignTop ); tqlayout->addWidget( label, row, 0 ); tqlayout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 ); } diff --git a/kode/kwsdl/kung/pageinputfield.h b/kode/kwsdl/kung/pageinputfield.h index 152d337ed..05321c31e 100644 --- a/kode/kwsdl/kung/pageinputfield.h +++ b/kode/kwsdl/kung/pageinputfield.h @@ -31,17 +31,18 @@ class PageInputField : public InputField { Q_OBJECT + TQ_OBJECT public: PageInputField( const TQString &name, const KWSDL::Message &message ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *parent ); + virtual TQWidget *createWidget( TQWidget *tqparent ); private: TQWidget *mInputWidget; diff --git a/kode/kwsdl/kung/simplebaseinputfield.cpp b/kode/kwsdl/kung/simplebaseinputfield.cpp index 0198723cf..bd2aa90ea 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 &parent ) +void SimpleBaseInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) { if ( mType->subType() == Schema::SimpleType::TypeRestriction ) { InputField *field = mFields.first(); if ( !field ) { qDebug( "SimpleBaseInputField: No child found" ); } else { - field->xmlData( document, parent ); + field->xmlData( document, tqparent ); } } else { qDebug( "SimpleBaseInputField: Unsupported subtype" ); @@ -103,7 +103,7 @@ TQString SimpleBaseInputField::data() const return TQString(); } -TQWidget *SimpleBaseInputField::createWidget( TQWidget *parent ) +TQWidget *SimpleBaseInputField::createWidget( TQWidget *tqparent ) { if ( mType->subType() == Schema::SimpleType::TypeRestriction ) { InputField *field = mFields.first(); @@ -111,7 +111,7 @@ TQWidget *SimpleBaseInputField::createWidget( TQWidget *parent ) qDebug( "SimpleBaseInputField: No child found" ); return 0; } else { - return field->createWidget( parent ); + return field->createWidget( tqparent ); } } else { qDebug( "SimpleBaseInputField: Unsupported subtype" ); diff --git a/kode/kwsdl/kung/simplebaseinputfield.h b/kode/kwsdl/kung/simplebaseinputfield.h index dab7e906c..aa52bc080 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 &parent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *parent ); + virtual TQWidget *createWidget( TQWidget *tqparent ); }; #endif diff --git a/kode/kwsdl/kung/stringinputfield.cpp b/kode/kwsdl/kung/stringinputfield.cpp index 390c5bc1b..6f1bc4f70 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 &parent ) +void StringInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:" + mTypeName ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - parent.appendChild( element ); + tqparent.appendChild( element ); } void StringInputField::setData( const TQString &data ) @@ -62,9 +62,9 @@ TQString StringInputField::data() const return mValue; } -TQWidget *StringInputField::createWidget( TQWidget *parent ) +TQWidget *StringInputField::createWidget( TQWidget *tqparent ) { - mInputWidget = new TQLineEdit( parent ); + mInputWidget = new TQLineEdit( tqparent ); 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 f8e8d5468..cd53a9b18 100644 --- a/kode/kwsdl/kung/stringinputfield.h +++ b/kode/kwsdl/kung/stringinputfield.h @@ -31,17 +31,18 @@ class TQLineEdit; class StringInputField : public SimpleInputField { Q_OBJECT + TQ_OBJECT public: StringInputField( const TQString &name, const TQString &typeName, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *parent ); + virtual TQWidget *createWidget( TQWidget *tqparent ); private slots: void inputChanged( const TQString& ); diff --git a/kode/kwsdl/kung/timeinputfield.cpp b/kode/kwsdl/kung/timeinputfield.cpp index 9da18a0cc..29b89fcab 100644 --- a/kode/kwsdl/kung/timeinputfield.cpp +++ b/kode/kwsdl/kung/timeinputfield.cpp @@ -39,29 +39,29 @@ void TimeInputField::setXMLData( const TQDomElement &element ) setData( element.text() ); } -void TimeInputField::xmlData( TQDomDocument &document, TQDomElement &parent ) +void TimeInputField::xmlData( TQDomDocument &document, TQDomElement &tqparent ) { TQDomElement element = document.createElement( mName ); element.setAttribute( "xsi:type", "xsd:time" ); TQDomText text = document.createTextNode( data() ); element.appendChild( text ); - parent.appendChild( element ); + tqparent.appendChild( element ); } void TimeInputField::setData( const TQString &data ) { - mValue = TQTime::fromString( data, Qt::ISODate ); + mValue = TQTime::fromString( data, TQt::ISODate ); } TQString TimeInputField::data() const { - return mValue.toString( Qt::ISODate ); + return mValue.toString( TQt::ISODate ); } -TQWidget *TimeInputField::createWidget( TQWidget *parent ) +TQWidget *TimeInputField::createWidget( TQWidget *tqparent ) { - mInputWidget = new KTimeWidget( parent ); + mInputWidget = new KTimeWidget( tqparent ); mInputWidget->setTime( mValue ); diff --git a/kode/kwsdl/kung/timeinputfield.h b/kode/kwsdl/kung/timeinputfield.h index c363151de..f3b14c9d8 100644 --- a/kode/kwsdl/kung/timeinputfield.h +++ b/kode/kwsdl/kung/timeinputfield.h @@ -32,17 +32,18 @@ class KTimeWidget; class TimeInputField : public SimpleInputField { Q_OBJECT + TQ_OBJECT public: TimeInputField( const TQString &name, const Schema::SimpleType *type ); virtual void setXMLData( const TQDomElement &element ); - virtual void xmlData( TQDomDocument &document, TQDomElement &parent ); + virtual void xmlData( TQDomDocument &document, TQDomElement &tqparent ); virtual void setData( const TQString &data ); virtual TQString data() const; - virtual TQWidget *createWidget( TQWidget *parent ); + virtual TQWidget *createWidget( TQWidget *tqparent ); private slots: void inputChanged( const TQTime& ); diff --git a/kode/kwsdl/kung/transport.h b/kode/kwsdl/kung/transport.h index 240755d18..6e6bec1cf 100644 --- a/kode/kwsdl/kung/transport.h +++ b/kode/kwsdl/kung/transport.h @@ -23,9 +23,10 @@ #include #include -class Transport : public QObject +class Transport : public TQObject { Q_OBJECT + TQ_OBJECT public: Transport( const TQString &url ); -- cgit v1.2.1