diff options
Diffstat (limited to 'kode/kwsdl/schema')
-rw-r--r-- | kode/kwsdl/schema/attribute.cpp | 14 | ||||
-rw-r--r-- | kode/kwsdl/schema/attribute.h | 32 | ||||
-rw-r--r-- | kode/kwsdl/schema/complextype.cpp | 38 | ||||
-rw-r--r-- | kode/kwsdl/schema/complextype.h | 54 | ||||
-rw-r--r-- | kode/kwsdl/schema/element.cpp | 18 | ||||
-rw-r--r-- | kode/kwsdl/schema/element.h | 38 | ||||
-rw-r--r-- | kode/kwsdl/schema/fileprovider.cpp | 28 | ||||
-rw-r--r-- | kode/kwsdl/schema/fileprovider.h | 10 | ||||
-rw-r--r-- | kode/kwsdl/schema/parser.cpp | 176 | ||||
-rw-r--r-- | kode/kwsdl/schema/parser.h | 68 | ||||
-rw-r--r-- | kode/kwsdl/schema/qualifiedname.cpp | 14 | ||||
-rw-r--r-- | kode/kwsdl/schema/qualifiedname.h | 26 | ||||
-rw-r--r-- | kode/kwsdl/schema/simpletype.cpp | 26 | ||||
-rw-r--r-- | kode/kwsdl/schema/simpletype.h | 44 | ||||
-rw-r--r-- | kode/kwsdl/schema/typestable.cpp | 18 | ||||
-rw-r--r-- | kode/kwsdl/schema/typestable.h | 24 | ||||
-rw-r--r-- | kode/kwsdl/schema/xsdtype.h | 20 |
17 files changed, 324 insertions, 324 deletions
diff --git a/kode/kwsdl/schema/attribute.cpp b/kode/kwsdl/schema/attribute.cpp index 9be9be790..5637f35cd 100644 --- a/kode/kwsdl/schema/attribute.cpp +++ b/kode/kwsdl/schema/attribute.cpp @@ -25,8 +25,8 @@ using namespace Schema; -Attribute::Attribute( const QString &name, int type, bool qualified, - const QString &defaultValue, const QString &fixedValue, +Attribute::Attribute( const TQString &name, int type, bool qualified, + const TQString &defaultValue, const TQString &fixedValue, bool use ) : mName( name ), mType( type ), mQualified( qualified ), mDefaultValue( defaultValue ), mFixedValue( fixedValue ), @@ -39,7 +39,7 @@ Attribute::Attribute() { } -QString Attribute::name() const +TQString Attribute::name() const { return mName; } @@ -49,22 +49,22 @@ int Attribute::type() const return mType; } -void Attribute::setTypeName( const QString &typeName ) +void Attribute::setTypeName( const TQString &typeName ) { mTypeName = typeName; } -QString Attribute::typeName() const +TQString Attribute::typeName() const { return mTypeName; } -QString Attribute::defaultValue() const +TQString Attribute::defaultValue() const { return mDefaultValue; } -QString Attribute::fixedValue() const +TQString Attribute::fixedValue() const { return mFixedValue; } diff --git a/kode/kwsdl/schema/attribute.h b/kode/kwsdl/schema/attribute.h index 62db99d7d..d7bdf364e 100644 --- a/kode/kwsdl/schema/attribute.h +++ b/kode/kwsdl/schema/attribute.h @@ -23,43 +23,43 @@ #ifndef SCHEMA_ATTRIBUTE_H #define SCHEMA_ATTRIBUTE_H -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> namespace Schema { class Attribute { public: - typedef QValueList<Attribute> List; - typedef QValueList<Attribute*> PtrList; + typedef TQValueList<Attribute> List; + typedef TQValueList<Attribute*> PtrList; Attribute(); - Attribute( const QString &name, int type, bool qualified = false, - const QString &defaultValue = QString(), - const QString &fixedValue = QString(), + Attribute( const TQString &name, int type, bool qualified = false, + const TQString &defaultValue = TQString(), + const TQString &fixedValue = TQString(), bool use = true ); - QString name() const; + TQString name() const; int type() const; - void setTypeName( const QString &typeName ); - QString typeName() const; + void setTypeName( const TQString &typeName ); + TQString typeName() const; - QString defaultValue() const; - QString fixedValue() const; + TQString defaultValue() const; + TQString fixedValue() const; bool isQualified() const; bool isUsed() const; private: - QString mName; + TQString mName; int mType; - QString mTypeName; + TQString mTypeName; bool mQualified; - QString mDefaultValue; - QString mFixedValue; + TQString mDefaultValue; + TQString mFixedValue; bool mUse; }; diff --git a/kode/kwsdl/schema/complextype.cpp b/kode/kwsdl/schema/complextype.cpp index 418fdf92f..51ed2ad08 100644 --- a/kode/kwsdl/schema/complextype.cpp +++ b/kode/kwsdl/schema/complextype.cpp @@ -24,7 +24,7 @@ using namespace Schema; -ComplexType::ComplexType( const QString &nameSpace ) +ComplexType::ComplexType( const TQString &nameSpace ) : mNameSpace( nameSpace ), mType ( 0 ), mContentModel( COMPLEX ), mMixed( false ), mAnonymous( false ), mIsArray( false ), mContentType( 0 ), mTopLevelGroup( ALL ), mCurrentGroup( 0 ), mPreviousGroup( 0 ), @@ -50,7 +50,7 @@ ComplexType::~ComplexType() { } -QString ComplexType::name() const +TQString ComplexType::name() const { return mName; } @@ -62,12 +62,12 @@ QualifiedName ComplexType::qualifiedName() const return qn; } -void ComplexType::setDocumentation( const QString &documentation ) +void ComplexType::setDocumentation( const TQString &documentation ) { mDocumentation = documentation; } -QString ComplexType::documentation() const +TQString ComplexType::documentation() const { return mDocumentation; } @@ -97,7 +97,7 @@ int ComplexType::attributeType( int index ) return attribute( index )->type(); } -QString ComplexType::attributeName( int index ) +TQString ComplexType::attributeName( int index ) { return attribute( index )->name(); } @@ -107,7 +107,7 @@ int ComplexType::elementType( int index ) return element( index )->type(); } -QString ComplexType::elementName( int index ) +TQString ComplexType::elementName( int index ) { return element( index )->name(); } @@ -127,12 +127,12 @@ bool ComplexType::isAnonymous() const return mAnonymous; } -void ComplexType::setBaseTypeName( const QString &baseTypeName ) +void ComplexType::setBaseTypeName( const TQString &baseTypeName ) { mBaseType.name = baseTypeName; } -QString ComplexType::baseTypeName() const +TQString ComplexType::baseTypeName() const { return mBaseType.name; } @@ -157,7 +157,7 @@ ComplexType::Compositor ComplexType::groupType( int groupId ) const return mGroups[ groupId ].type; } -const Element *ComplexType::element( const QString &name ) +const Element *ComplexType::element( const TQString &name ) { Element::List::ConstIterator it; for ( it = mElements.begin(); it != mElements.end(); ++it ) { @@ -183,7 +183,7 @@ Element *ComplexType::element( int id ) return 0; } -const Attribute *ComplexType::attribute( const QString &name ) +const Attribute *ComplexType::attribute( const TQString &name ) { Attribute::List::ConstIterator it; for ( it = mAttributes.begin(); it != mAttributes.end(); ++it ) { @@ -254,7 +254,7 @@ void ComplexType::setAnonymous( bool anonymous ) mAnonymous = anonymous; } -void ComplexType::setName( const QString &name ) +void ComplexType::setName( const TQString &name ) { mName = name; } @@ -274,8 +274,8 @@ void ComplexType::setContentModel( int model ) mMixed = false; } -void ComplexType::addAttribute( const QString &name, int type_id, bool qualified, - const QString &defaultValue, const QString &fixedValue, +void ComplexType::addAttribute( const TQString &name, int type_id, bool qualified, + const TQString &defaultValue, const TQString &fixedValue, bool use ) { if ( type_id == 0 ) { @@ -295,15 +295,15 @@ void ComplexType::addAttribute( const QString &name, int type_id, bool qualified void ComplexType::addAttributeRef( const QualifiedName &name, bool qualified, bool use ) { - addAttribute( name.localName(), XSDType::ANYTYPE, qualified, QString(), QString(), use ); + addAttribute( name.localName(), XSDType::ANYTYPE, qualified, TQString(), TQString(), use ); mForwardAttributeRef = true; } -void ComplexType::addElement( const QString &name, int type_id, int minOccurs, +void ComplexType::addElement( const TQString &name, int type_id, int minOccurs, int maxOccurs, bool qualified, - const QString &defaultValue, const QString &fixedValue, - const QString &documentation ) + const TQString &defaultValue, const TQString &fixedValue, + const TQString &documentation ) { if ( type_id == 0 ) { qDebug( "ComplexType:addElement() :No type given for element " ); @@ -332,7 +332,7 @@ void ComplexType::addElementRef( const QualifiedName &name, int minOccurs, int m mForwardElementRef = true; } -void ComplexType::matchElementRef( const QString &name, Element &element ) +void ComplexType::matchElementRef( const TQString &name, Element &element ) { if ( mForwardElementRef ) { Element *elementPtr = (Element*)this->element( name ); @@ -350,7 +350,7 @@ void ComplexType::matchElementRef( const QString &name, Element &element ) } } -void ComplexType::matchAttributeRef( const QString &name, Attribute &attribute ) +void ComplexType::matchAttributeRef( const TQString &name, Attribute &attribute ) { if ( mForwardAttributeRef ) { Attribute *attributePtr = (Attribute*)this->attribute( name ); diff --git a/kode/kwsdl/schema/complextype.h b/kode/kwsdl/schema/complextype.h index 8664e007a..39db08b69 100644 --- a/kode/kwsdl/schema/complextype.h +++ b/kode/kwsdl/schema/complextype.h @@ -23,7 +23,7 @@ #ifndef SCHEMA_COMPLEXTYPE_H #define SCHEMA_COMPLEXTYPE_H -#include <qstring.h> +#include <tqstring.h> #include "attribute.h" #include "element.h" @@ -35,7 +35,7 @@ namespace Schema { class ComplexType : public XSDType { public: - typedef QValueList<ComplexType> List; + typedef TQValueList<ComplexType> List; typedef enum { SEQ = 0, @@ -49,16 +49,16 @@ class ComplexType : public XSDType } Derivation; ComplexType(); - ComplexType( const QString& ); + ComplexType( const TQString& ); ~ComplexType(); - void setName( const QString &name ); - QString name() const; + void setName( const TQString &name ); + TQString name() const; QualifiedName qualifiedName() const; - void setDocumentation( const QString &documentation ); - QString documentation() const; + void setDocumentation( const TQString &documentation ); + TQString documentation() const; void setType( int type ); int type() const; @@ -72,10 +72,10 @@ class ComplexType : public XSDType bool isSimple() const; int attributeType( int index ); - QString attributeName( int index ); + TQString attributeName( int index ); int elementType( int index ); - QString elementName( int index ); + TQString elementName( int index ); int numElements() const; int numAttributes() const; @@ -84,17 +84,17 @@ class ComplexType : public XSDType bool isAnonymous() const; void setBaseType( int type, Derivation derivation, const XSDType *ptr ); - void setBaseTypeName( const QString &baseTypeName ); + void setBaseTypeName( const TQString &baseTypeName ); int baseType() const; int baseDerivation() const; - QString baseTypeName() const; + TQString baseTypeName() const; Compositor topLevelGroup() const; Compositor groupType( int groupId ) const; - const Element *element( const QString &name ); - const Attribute *attribute( const QString &name ); + const Element *element( const TQString &name ); + const Attribute *attribute( const TQString &name ); Element *element( int id ); Attribute *attribute( int id ); @@ -109,29 +109,29 @@ class ComplexType : public XSDType void setCompositor( Compositor type, bool open = true, int minOccurs = 1, int maxOccurs = 1 ); - void addAttribute( const QString &name, int type_id, bool qualified = false, - const QString &defaultValue = QString(), - const QString &fixedValue = QString(), + void addAttribute( const TQString &name, int type_id, bool qualified = false, + const TQString &defaultValue = TQString(), + const TQString &fixedValue = TQString(), bool use = false ); void addAttributeRef( const QualifiedName &name, bool qualified, bool use ); - void addElement( const QString &name, int type_id, int minOccurs = 1, + void addElement( const TQString &name, int type_id, int minOccurs = 1, int maxOccurs = 1, bool qualified = false, - const QString &defaultValue = QString(), - const QString &fixedValue = QString(), - const QString &documentation = QString() ); + const TQString &defaultValue = TQString(), + const TQString &fixedValue = TQString(), + const TQString &documentation = TQString() ); void addElementRef( const QualifiedName &name, int minOccurs, int maxOccurs ); - void matchAttributeRef( const QString &name, Attribute &attribute ); - void matchElementRef( const QString &name, Element &element ); + void matchAttributeRef( const TQString &name, Attribute &attribute ); + void matchElementRef( const TQString &name, Element &element ); bool checkOccurrences(); void resetCounters(); private: - QString mName; - QString mNameSpace; - QString mDocumentation; + TQString mName; + TQString mNameSpace; + TQString mDocumentation; int mType; Element::List mElements; @@ -148,7 +148,7 @@ class ComplexType : public XSDType int typeId; Derivation derivation; const XSDType *type; - QString name; + TQString name; } mBaseType; struct CompositorStruct @@ -167,7 +167,7 @@ class ComplexType : public XSDType int maxOccurs; }; - QValueList<struct CompositorStruct> mGroups; + TQValueList<struct CompositorStruct> mGroups; Compositor mTopLevelGroup; int mCurrentGroup; diff --git a/kode/kwsdl/schema/element.cpp b/kode/kwsdl/schema/element.cpp index bfb745e2b..d8edbee9d 100644 --- a/kode/kwsdl/schema/element.cpp +++ b/kode/kwsdl/schema/element.cpp @@ -31,15 +31,15 @@ Element::Element() { } -Element::Element( const QString &name, int type, int minOccurs, int maxOccurs, - bool qualified, const QString &defaultValue, const QString &fixedValue ) +Element::Element( const TQString &name, int type, int minOccurs, int maxOccurs, + bool qualified, const TQString &defaultValue, const TQString &fixedValue ) : mName( name ), mType( type ), mMinOccurs( minOccurs ), mMaxOccurs( maxOccurs ), mQualified( qualified ), mDefaultValue( defaultValue ), mFixedValue( fixedValue ), mOccurrence( 0 ) { } -QString Element::name() const +TQString Element::name() const { return mName; } @@ -54,22 +54,22 @@ int Element::type() const return mType; } -void Element::setTypeName( const QString &typeName ) +void Element::setTypeName( const TQString &typeName ) { mTypeName = typeName; } -QString Element::typeName() const +TQString Element::typeName() const { return mTypeName; } -void Element::setDocumentation( const QString &documentation ) +void Element::setDocumentation( const TQString &documentation ) { mDocumentation = documentation; } -QString Element::documentation() const +TQString Element::documentation() const { return mDocumentation; } @@ -104,12 +104,12 @@ int Element::maxOccurs() const return mMaxOccurs; } -QString Element::defaultValue() const +TQString Element::defaultValue() const { return mDefaultValue; } -QString Element::fixedValue() const +TQString Element::fixedValue() const { return mFixedValue; } diff --git a/kode/kwsdl/schema/element.h b/kode/kwsdl/schema/element.h index 6335693f6..dfd886b41 100644 --- a/kode/kwsdl/schema/element.h +++ b/kode/kwsdl/schema/element.h @@ -23,8 +23,8 @@ #ifndef SCHEMA_ELEMENT_H #define SCHEMA_ELEMENT_H -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> #define UNBOUNDED 1000 @@ -33,25 +33,25 @@ namespace Schema { class Element { public: - typedef QValueList<Element> List; - typedef QValueList<Element*> PtrList; + typedef TQValueList<Element> List; + typedef TQValueList<Element*> PtrList; Element(); - Element( const QString &name, int type, int minOccurs = 1, int maxOccurs = 1, - bool qualified = false, const QString &defaultValue = QString(), - const QString &fixedValue = QString() ); + Element( const TQString &name, int type, int minOccurs = 1, int maxOccurs = 1, + bool qualified = false, const TQString &defaultValue = TQString(), + const TQString &fixedValue = TQString() ); - QString name() const; + TQString name() const; void setType( int id ); int type() const; - void setTypeName( const QString &typeName ); - QString typeName() const; + void setTypeName( const TQString &typeName ); + TQString typeName() const; - void setDocumentation( const QString &documentation ); - QString documentation() const; + void setDocumentation( const TQString &documentation ); + TQString documentation() const; void setGroupId( int group ); int groupId() const; @@ -62,8 +62,8 @@ class Element void setMaxOccurs( int maxOccurs ); int maxOccurs() const; - QString defaultValue() const; - QString fixedValue() const; + TQString defaultValue() const; + TQString fixedValue() const; bool isQualified() const; @@ -71,15 +71,15 @@ class Element int occurrence() const; private: - QString mName; + TQString mName; int mType; - QString mTypeName; - QString mDocumentation; + TQString mTypeName; + TQString mDocumentation; int mMinOccurs; int mMaxOccurs; bool mQualified; - QString mDefaultValue; - QString mFixedValue; + TQString mDefaultValue; + TQString mFixedValue; int mGroupId; int mOccurrence; }; diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp index 642592bf4..2a7448c4f 100644 --- a/kode/kwsdl/schema/fileprovider.cpp +++ b/kode/kwsdl/schema/fileprovider.cpp @@ -21,9 +21,9 @@ #include <unistd.h> -#include <qapplication.h> -#include <qeventloop.h> -#include <qfile.h> +#include <tqapplication.h> +#include <tqeventloop.h> +#include <tqfile.h> #include <kio/job.h> #include <ktempfile.h> @@ -33,11 +33,11 @@ using namespace Schema; FileProvider::FileProvider() - : QObject( 0 ), mBlocked( false ) + : TQObject( 0 ), mBlocked( false ) { } -bool FileProvider::get( const QString &url, QString &target ) +bool FileProvider::get( const TQString &url, TQString &target ) { if ( !mFileName.isEmpty() ) cleanUp(); @@ -53,14 +53,14 @@ bool FileProvider::get( const QString &url, QString &target ) qDebug( "Downloading external schema '%s'", url.latin1() ); KIO::TransferJob* job = KIO::get( KURL( url ), false, false ); - connect( job, SIGNAL( data( KIO::Job*, const QByteArray& ) ), - this, SLOT( slotData( KIO::Job*, const QByteArray& ) ) ); - connect( job, SIGNAL( result( KIO::Job* ) ), - this, SLOT( slotResult( KIO::Job* ) ) ); + connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), + this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job* ) ), + this, TQT_SLOT( slotResult( KIO::Job* ) ) ); mBlocked = true; while ( mBlocked ) { - qApp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput ); + qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); usleep( 500 ); } @@ -69,11 +69,11 @@ bool FileProvider::get( const QString &url, QString &target ) void FileProvider::cleanUp() { - ::unlink( QFile::encodeName( mFileName ) ); - mFileName = QString(); + ::unlink( TQFile::encodeName( mFileName ) ); + mFileName = TQString(); } -void FileProvider::slotData( KIO::Job*, const QByteArray &data ) +void FileProvider::slotData( KIO::Job*, const TQByteArray &data ) { unsigned int oldSize = mData.size(); mData.resize( oldSize + data.size() ); @@ -87,7 +87,7 @@ void FileProvider::slotResult( KIO::Job *job ) return; } - QFile file( mFileName ); + TQFile file( mFileName ); if ( !file.open( IO_WriteOnly ) ) { qDebug( "Unable to create temporary file" ); return; diff --git a/kode/kwsdl/schema/fileprovider.h b/kode/kwsdl/schema/fileprovider.h index 8b2903c50..c665c3dac 100644 --- a/kode/kwsdl/schema/fileprovider.h +++ b/kode/kwsdl/schema/fileprovider.h @@ -22,7 +22,7 @@ #ifndef SCHEMA_FILEPROVIDER_H #define SCHEMA_FILEPROVIDER_H -#include <qobject.h> +#include <tqobject.h> namespace KIO { class Job; @@ -37,16 +37,16 @@ class FileProvider : QObject public: FileProvider(); - bool get( const QString &url, QString &target ); + bool get( const TQString &url, TQString &target ); void cleanUp(); private slots: - void slotData( KIO::Job*, const QByteArray& ); + void slotData( KIO::Job*, const TQByteArray& ); void slotResult( KIO::Job* ); private: - QString mFileName; - QByteArray mData; + TQString mFileName; + TQByteArray mData; bool mBlocked; }; diff --git a/kode/kwsdl/schema/parser.cpp b/kode/kwsdl/schema/parser.cpp index ec0daabe4..7ec3804f8 100644 --- a/kode/kwsdl/schema/parser.cpp +++ b/kode/kwsdl/schema/parser.cpp @@ -20,20 +20,20 @@ Boston, MA 02110-1301, USA. */ -#include <qdir.h> -#include <qfile.h> -#include <qurl.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqurl.h> #include "fileprovider.h" #include "parser.h" using namespace Schema; -const QString soapEncUri = "http://schemas.xmlsoap.org/soap/encoding/"; -const QString wsdlUri = "http://schemas.xmlsoap.org/wsdl/"; +const TQString soapEncUri = "http://schemas.xmlsoap.org/soap/encoding/"; +const TQString wsdlUri = "http://schemas.xmlsoap.org/wsdl/"; -Parser::Parser( const QString &nameSpace ) +Parser::Parser( const TQString &nameSpace ) : mNameSpace( nameSpace ) { mElementQualified = false; @@ -113,24 +113,24 @@ void Parser::clear() delete mAttributes[ i ]; } -void Parser::setSchemaBaseUrl( const QString &url ) +void Parser::setSchemaBaseUrl( const TQString &url ) { mSchemaBaseUrl = url; } -void Parser::parseNameSpace( const QDomElement &element ) +void Parser::parseNameSpace( const TQDomElement &element ) { - QDomNamedNodeMap attributes = element.attributes(); + TQDomNamedNodeMap attributes = element.attributes(); for ( uint i = 0; i < attributes.count(); ++i ) { - QDomNode node = attributes.item( i ); - QDomAttr attribute = node.toAttr(); + TQDomNode node = attributes.item( i ); + TQDomAttr attribute = node.toAttr(); if ( attribute.name().startsWith( "xmlns:" ) ) mNameSpaceMap.insert( attribute.value(), attribute.name().mid( 6 ) ); } } -bool Parser::parseSchemaTag( const QDomElement &root ) +bool Parser::parseSchemaTag( const TQDomElement &root ) { QualifiedName name = root.tagName(); if ( name.localName() != "schema" ) @@ -140,7 +140,7 @@ bool Parser::parseSchemaTag( const QDomElement &root ) mNameSpace = root.attribute( "targetNamespace" ); if ( root.hasAttribute( "elementFormDefault" ) ) { - const QString value = root.attribute( "elementFormDefault" ); + const TQString value = root.attribute( "elementFormDefault" ); if ( value == "unqualified" ) mElementQualified = false; else if ( value == "qualified" ) @@ -156,9 +156,9 @@ bool Parser::parseSchemaTag( const QDomElement &root ) m_tnsPrefix = xParser->getNamespacePrefix(i); */ - QDomNode node = root.firstChild(); + TQDomNode node = root.firstChild(); while ( !node.isNull() ) { - QDomElement element = node.toElement(); + TQDomElement element = node.toElement(); if ( !element.isNull() ) { QualifiedName name = element.tagName(); @@ -195,9 +195,9 @@ bool Parser::parseSchemaTag( const QDomElement &root ) return true; } -void Parser::parseImport( const QDomElement &element ) +void Parser::parseImport( const TQDomElement &element ) { - QString location = element.attribute( "schemaLocation" ); + TQString location = element.attribute( "schemaLocation" ); if ( !location.isEmpty() ) { // don't import a schema twice if ( mImportedSchemas.contains( location ) ) @@ -209,15 +209,15 @@ void Parser::parseImport( const QDomElement &element ) } } -void Parser::parseAnnotation( const QDomElement& ) +void Parser::parseAnnotation( const TQDomElement& ) { } -void Parser::parseAnnotation( const QDomElement &element, QString &documentation ) +void Parser::parseAnnotation( const TQDomElement &element, TQString &documentation ) { - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); while ( !node.isNull() ) { - QDomElement childElement = node.toElement(); + TQDomElement childElement = node.toElement(); if ( !childElement.isNull() ) { QualifiedName name = childElement.tagName(); if ( name.localName() == "documentation" ) @@ -228,11 +228,11 @@ void Parser::parseAnnotation( const QDomElement &element, QString &documentation } } -void Parser::parseAnnotation( const QDomElement &element, ComplexType *complexType ) +void Parser::parseAnnotation( const TQDomElement &element, ComplexType *complexType ) { - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); while ( !node.isNull() ) { - QDomElement childElement = node.toElement(); + TQDomElement childElement = node.toElement(); if ( !childElement.isNull() ) { QualifiedName name = childElement.tagName(); if ( name.localName() == "documentation" ) @@ -243,11 +243,11 @@ void Parser::parseAnnotation( const QDomElement &element, ComplexType *complexTy } } -void Parser::parseAnnotation( const QDomElement &element, SimpleType *simpleType ) +void Parser::parseAnnotation( const TQDomElement &element, SimpleType *simpleType ) { - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); while ( !node.isNull() ) { - QDomElement childElement = node.toElement(); + TQDomElement childElement = node.toElement(); if ( !childElement.isNull() ) { QualifiedName name = childElement.tagName(); if ( name.localName() == "documentation" ) @@ -258,7 +258,7 @@ void Parser::parseAnnotation( const QDomElement &element, SimpleType *simpleType } } -XSDType *Parser::parseComplexType( const QDomElement &element ) +XSDType *Parser::parseComplexType( const TQDomElement &element ) { ComplexType *newType = new ComplexType( mNameSpace ); @@ -266,9 +266,9 @@ XSDType *Parser::parseComplexType( const QDomElement &element ) if ( element.hasAttribute( "mixed" ) ) newType->setContentModel( newType->MIXED ); - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); while ( !node.isNull() ) { - QDomElement childElement = node.toElement(); + TQDomElement childElement = node.toElement(); if ( !childElement.isNull() ) { QualifiedName name = childElement.tagName(); @@ -297,18 +297,18 @@ XSDType *Parser::parseComplexType( const QDomElement &element ) return newType; } -void Parser::all( const QDomElement &element, ComplexType * ct ) +void Parser::all( const TQDomElement &element, ComplexType * ct ) { int min, max; - QString tmp; + TQString tmp; min = element.attribute( "minOccurs", "1" ).toInt(); max = element.attribute( "maxOccurs", "1" ).toInt(); ct->setCompositor( ct->ALL, true, min, max ); - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); while ( !node.isNull() ) { - QDomElement childElement = node.toElement(); + TQDomElement childElement = node.toElement(); if ( !childElement.isNull() ) { QualifiedName name = childElement.tagName(); @@ -332,14 +332,14 @@ void Parser::all( const QDomElement &element, ComplexType * ct ) } -void Parser::cs( const QDomElement &element, ComplexType *ct ) +void Parser::cs( const TQDomElement &element, ComplexType *ct ) { int min = 1, max = 1; QualifiedName name = element.tagName(); if ( name.localName() == "choice" || name.localName() == "sequence" ) { min = element.attribute( "minOccurs", "1" ).toInt(); - QString value = element.attribute( "maxOccurs", "1" ); + TQString value = element.attribute( "maxOccurs", "1" ); if ( value == "unbounded" ) max = UNBOUNDED; else @@ -350,9 +350,9 @@ void Parser::cs( const QDomElement &element, ComplexType *ct ) else ct->setCompositor( ct->SEQ, true, min, max ); - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); while ( !node.isNull() ) { - QDomElement childElement = node.toElement(); + TQDomElement childElement = node.toElement(); if ( !childElement.isNull() ) { QualifiedName csName = childElement.tagName(); if ( csName.localName() == "element" ) @@ -377,9 +377,9 @@ void Parser::cs( const QDomElement &element, ComplexType *ct ) return; } -void Parser::addElement( const QDomElement &element, ComplexType *cType ) +void Parser::addElement( const TQDomElement &element, ComplexType *cType ) { - QString name, fixedValue, defaultValue, documentation; + TQString name, fixedValue, defaultValue, documentation; QualifiedName refName; int type_id = 0, minOccurs = 1, maxOccurs = 1; bool qualified = false, added = false, nill = false; @@ -418,7 +418,7 @@ void Parser::addElement( const QDomElement &element, ComplexType *cType ) } minOccurs = element.attribute( "minOccurs", "1" ).toInt(); - QString value = element.attribute( "maxOccurs", "1" ); + TQString value = element.attribute( "maxOccurs", "1" ); if ( value == "unbounded" ) maxOccurs = UNBOUNDED; else @@ -430,9 +430,9 @@ void Parser::addElement( const QDomElement &element, ComplexType *cType ) if ( element.hasAttribute( "nillable" ) ) nill = true; - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); while ( !node.isNull() ) { - QDomElement childElement = node.toElement(); + TQDomElement childElement = node.toElement(); if ( !childElement.isNull() ) { QualifiedName childName = childElement.tagName(); @@ -476,14 +476,14 @@ void Parser::addElement( const QDomElement &element, ComplexType *cType ) } } -void Parser::addAny( const QDomElement &element, ComplexType *cType ) +void Parser::addAny( const TQDomElement &element, ComplexType *cType ) { - QString ns, any( "any" ); + TQString ns, any( "any" ); int type_id = XSDType::ANY, min = 1, max = 1; ns = element.attribute( "namespace" ); min = element.attribute( "minOccurs", "1" ).toInt(); - QString value = element.attribute( "maxOccurs", "1" ); + TQString value = element.attribute( "maxOccurs", "1" ); if ( value == "unbounded" ) max = UNBOUNDED; else @@ -492,18 +492,18 @@ void Parser::addAny( const QDomElement &element, ComplexType *cType ) cType->addElement( any, type_id, min, max, false, ns ); } -void Parser::addAnyAttribute( const QDomElement &element, ComplexType *cType ) +void Parser::addAnyAttribute( const TQDomElement &element, ComplexType *cType ) { - QString ns, anyAttribute( "anyAttribute" ); + TQString ns, anyAttribute( "anyAttribute" ); ns = element.attribute( "namespace" ); cType->addAttribute( anyAttribute, XSDType::ANY, false, ns ); } -void Parser::addAttribute( const QDomElement &element, ComplexType *cType ) +void Parser::addAttribute( const TQDomElement &element, ComplexType *cType ) { - QString name, fixedVal, defaultVal; + TQString name, fixedVal, defaultVal; int type_id = 0; bool qualified = false, use = false, added = false; QualifiedName refAttribute; @@ -553,9 +553,9 @@ void Parser::addAttribute( const QDomElement &element, ComplexType *cType ) use = true; } - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); while ( !node.isNull() ) { - QDomElement childElement = node.toElement(); + TQDomElement childElement = node.toElement(); if ( !childElement.isNull() ) { QualifiedName childName = childElement.tagName(); @@ -579,7 +579,7 @@ void Parser::addAttribute( const QDomElement &element, ComplexType *cType ) cType->addAttributeRef( refAttribute, qualified, use ); } -XSDType *Parser::parseSimpleType( const QDomElement &element ) +XSDType *Parser::parseSimpleType( const TQDomElement &element ) { SimpleType *st = new SimpleType( mNameSpace ); @@ -587,9 +587,9 @@ XSDType *Parser::parseSimpleType( const QDomElement &element ) st->setName( element.attribute( "name" ) ); - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); while ( !node.isNull() ) { - QDomElement childElement = node.toElement(); + TQDomElement childElement = node.toElement(); if ( !childElement.isNull() ) { QualifiedName name = childElement.tagName(); @@ -624,14 +624,14 @@ XSDType *Parser::parseSimpleType( const QDomElement &element ) return st; } -void Parser::parseRestriction( const QDomElement &element, SimpleType *st ) +void Parser::parseRestriction( const TQDomElement &element, SimpleType *st ) { if ( st->baseType() == 0 ) qDebug( "<restriction>:unkown BaseType" ); - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); while ( !node.isNull() ) { - QDomElement childElement = node.toElement(); + TQDomElement childElement = node.toElement(); if ( !childElement.isNull() ) { if ( !st->isValidFacet( childElement.tagName() ) ) { @@ -646,7 +646,7 @@ void Parser::parseRestriction( const QDomElement &element, SimpleType *st ) } } -void Parser::parseComplexContent( const QDomElement &element, ComplexType *ct ) +void Parser::parseComplexContent( const TQDomElement &element, ComplexType *ct ) { QualifiedName typeName; @@ -657,9 +657,9 @@ void Parser::parseComplexContent( const QDomElement &element, ComplexType *ct ) ct->setContentModel( ct->COMPLEX ); - QDomNode node = element.firstChild(); + TQDomNode node = element.firstChild(); while ( !node.isNull() ) { - QDomElement childElement = node.toElement(); + TQDomElement childElement = node.toElement(); if ( !childElement.isNull() ) { QualifiedName name = childElement.tagName(); @@ -680,16 +680,16 @@ void Parser::parseComplexContent( const QDomElement &element, ComplexType *ct ) // if the base soapenc:Array, then read only the arrayType attribute and nothing else if ( typeName.localName() == "Array" ) { - QDomElement arrayElement = childElement.firstChild().toElement(); + TQDomElement arrayElement = childElement.firstChild().toElement(); ct->setIsArray( true ); QualifiedName arrayType( arrayElement.attribute( "arrayType" ) ); // arrayType.setNamespace(xParser->getNamespace(arrayType.getPrefix())); ct->addElement( "item", typeId( arrayType, true ), 0, UNBOUNDED ); } else { - QDomNode childNode = childElement.firstChild(); + TQDomNode childNode = childElement.firstChild(); while ( !childNode.isNull() ) { - QDomElement ctElement = childNode.toElement(); + TQDomElement ctElement = childNode.toElement(); if ( !ctElement.isNull() ) { QualifiedName name = ctElement.tagName(); @@ -716,11 +716,11 @@ void Parser::parseComplexContent( const QDomElement &element, ComplexType *ct ) } } -void Parser::parseSimpleContent( const QDomElement &element, ComplexType *ct ) +void Parser::parseSimpleContent( const TQDomElement &element, ComplexType *ct ) { ct->setContentModel( ct->SIMPLE ); - const QDomElement childElement = element.firstChild().toElement(); + const TQDomElement childElement = element.firstChild().toElement(); QualifiedName name = childElement.tagName(); if ( name.localName() == "restriction" ) { @@ -753,9 +753,9 @@ void Parser::parseSimpleContent( const QDomElement &element, ComplexType *ct ) // typeName.setNamespace(xParser->getNamespace(typeName.getPrefix())); ct->setContentType( basetype_id = typeId( typeName, true ) ); - QDomNode childNode = childElement.firstChild(); + TQDomNode childNode = childElement.firstChild(); while ( !childNode.isNull() ) { - QDomElement ctElement = childNode.toElement(); + TQDomElement ctElement = childNode.toElement(); if ( !ctElement.isNull() ) { QualifiedName name = ctElement.tagName(); if ( name.localName() == "attribute" ) @@ -776,7 +776,7 @@ bool Parser::isBasicType( int type ) const return true; } -void Parser::parseElement( const QDomElement &element ) +void Parser::parseElement( const TQDomElement &element ) { ComplexType *ct = new ComplexType( mNameSpace ); addElement( element, ct ); @@ -793,7 +793,7 @@ void Parser::parseElement( const QDomElement &element ) mElements.append( elementPtr ); } -void Parser::parseAttribute( const QDomElement &element ) +void Parser::parseAttribute( const TQDomElement &element ) { ComplexType *ct = new ComplexType( mNameSpace ); addAttribute( element, ct ); @@ -805,7 +805,7 @@ void Parser::parseAttribute( const QDomElement &element ) mAttributes.append( attributePtr ); } -int Parser::addExternalElement( const QString &name, int localTypeId ) +int Parser::addExternalElement( const TQString &name, int localTypeId ) { Element *element = new Element( name, localTypeId ); mElements.append( element ); @@ -817,7 +817,7 @@ int Parser::typeId( const QualifiedName &type, bool create ) { QualifiedName typeName( type ); - QString typens = typeName.nameSpace(); + TQString typens = typeName.nameSpace(); if ( typens.isEmpty() ) typeName.setNameSpace( typens = mNameSpace ); @@ -828,7 +828,7 @@ int Parser::typeId( const QualifiedName &type, bool create ) } } -QString Parser::typeName( int id ) const +TQString Parser::typeName( int id ) const { return mTypesTable.typeName( id ); } @@ -880,7 +880,7 @@ void Parser::resolveForwardDerivations() int id; ComplexType *type = 0; - QValueList<ForwardDerivation>::ConstIterator it; + TQValueList<ForwardDerivation>::ConstIterator it; for ( it = mForwardDerivations.begin(); it != mForwardDerivations.end(); ++it ) { if ( ( id = typeId( (*it).type, false ) ) == 0 ) continue; @@ -898,7 +898,7 @@ int Parser::elementId( const QualifiedName &type ) { QualifiedName typeName( type ); - QString typens = typeName.nameSpace(); + TQString typens = typeName.nameSpace(); if ( typens.isEmpty() ) typeName.setNameSpace( typens = mNameSpace ); @@ -930,7 +930,7 @@ Element *Parser::element( const QualifiedName &name ) const { QualifiedName elementName( name ); - QString typens = elementName.nameSpace(); + TQString typens = elementName.nameSpace(); if ( typens.isEmpty() ) elementName.setNameSpace( typens = mNameSpace ); @@ -965,7 +965,7 @@ int Parser::attributeId( const QualifiedName &type ) const { QualifiedName typeName( type ); - QString typens = typeName.nameSpace(); + TQString typens = typeName.nameSpace(); if ( typens.isEmpty() ) typeName.setNameSpace( typens = mNameSpace ); @@ -1012,7 +1012,7 @@ Attribute *Parser::attribute( const QualifiedName &name ) const return 0; } -QString Parser::targetNamespace() const +TQString Parser::targetNamespace() const { return mNameSpace; } @@ -1052,27 +1052,27 @@ bool Parser::shouldResolve() return true; } -void Parser::importSchema( const QString &location ) +void Parser::importSchema( const TQString &location ) { FileProvider provider; - QString fileName; - QString schemaLocation( location ); + TQString fileName; + TQString schemaLocation( location ); - QUrl url( location ); - QDir dir( location ); + TQUrl url( location ); + TQDir dir( location ); if ( (url.protocol().isEmpty() || url.protocol() == "file") && dir.isRelative() ) schemaLocation = mSchemaBaseUrl + "/" + location; if ( provider.get( schemaLocation, fileName ) ) { - QFile file( fileName ); + TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { qDebug( "Unable to open file %s", file.name().latin1() ); return; } - QDomDocument doc( "kwsdl" ); - QString errorMsg; + TQDomDocument doc( "kwsdl" ); + TQString errorMsg; int errorLine, errorColumn; bool ok = doc.setContent( &file, true, &errorMsg, &errorLine, &errorColumn ); if ( !ok ) { @@ -1080,9 +1080,9 @@ void Parser::importSchema( const QString &location ) return; } - QDomNodeList nodes = doc.elementsByTagName( "schema" ); + TQDomNodeList nodes = doc.elementsByTagName( "schema" ); if ( nodes.count() > 0 ) { - QDomElement schemaElement = nodes.item( 0 ).toElement(); + TQDomElement schemaElement = nodes.item( 0 ).toElement(); parseSchemaTag( schemaElement ); } else { qDebug( "No schema tag found in schema file" ); diff --git a/kode/kwsdl/schema/parser.h b/kode/kwsdl/schema/parser.h index afaf3dae6..3469e016b 100644 --- a/kode/kwsdl/schema/parser.h +++ b/kode/kwsdl/schema/parser.h @@ -23,8 +23,8 @@ #ifndef SCHEMA_PARSER_H #define SCHEMA_PARSER_H -#include <qdom.h> -#include <qvaluelist.h> +#include <tqdom.h> +#include <tqvaluelist.h> #include "types.h" #include "typestable.h" @@ -34,23 +34,23 @@ namespace Schema { class Parser { public: - Parser( const QString &nameSpace = QString() ); + Parser( const TQString &nameSpace = TQString() ); ~Parser(); Types types() const; void clear(); - void setSchemaBaseUrl( const QString& ); + void setSchemaBaseUrl( const TQString& ); - void parseNameSpace( const QDomElement &element ); - bool parseSchemaTag( const QDomElement &element ); + void parseNameSpace( const TQDomElement &element ); + bool parseSchemaTag( const TQDomElement &element ); const XSDType *type( const QualifiedName &type ); const XSDType *type( int id ) const; int numTypes() const; - QString typeName( int id ) const; + TQString typeName( int id ) const; Element *element( const QualifiedName &element ) const; Element *element( int id ) const; @@ -61,7 +61,7 @@ class Parser Attribute *attribute( int id ) const; int numAttributes() const; - QString targetNamespace() const; + TQString targetNamespace() const; int typeId( const QualifiedName &name, bool create = false ); @@ -75,30 +75,30 @@ class Parser int attributeType( const QualifiedName &type ); private: - void parseImport( const QDomElement& ); - void parseElement( const QDomElement& ); - void parseAttribute( const QDomElement& ); + void parseImport( const TQDomElement& ); + void parseElement( const TQDomElement& ); + void parseAttribute( const TQDomElement& ); - void parseAnnotation( const QDomElement& ); - void parseAnnotation( const QDomElement&, QString& ); - void parseAnnotation( const QDomElement&, ComplexType* ); - void parseAnnotation( const QDomElement&, SimpleType* ); - XSDType *parseComplexType( const QDomElement& ); + void parseAnnotation( const TQDomElement& ); + void parseAnnotation( const TQDomElement&, TQString& ); + void parseAnnotation( const TQDomElement&, ComplexType* ); + void parseAnnotation( const TQDomElement&, SimpleType* ); + XSDType *parseComplexType( const TQDomElement& ); - void all( const QDomElement&, ComplexType* ); - void cs( const QDomElement&, ComplexType* ); + void all( const TQDomElement&, ComplexType* ); + void cs( const TQDomElement&, ComplexType* ); - void addElement( const QDomElement&, ComplexType* ); + void addElement( const TQDomElement&, ComplexType* ); - void addAttribute( const QDomElement&, ComplexType* ); - void addAny( const QDomElement&, ComplexType* ); - void addAnyAttribute( const QDomElement&, ComplexType* ); - int addExternalElement( const QString&, int ); + void addAttribute( const TQDomElement&, ComplexType* ); + void addAny( const TQDomElement&, ComplexType* ); + void addAnyAttribute( const TQDomElement&, ComplexType* ); + int addExternalElement( const TQString&, int ); - XSDType *parseSimpleType( const QDomElement& ); - void parseRestriction( const QDomElement&, SimpleType* ); - void parseComplexContent( const QDomElement&, ComplexType* ); - void parseSimpleContent( const QDomElement&, ComplexType* ); + XSDType *parseSimpleType( const TQDomElement& ); + void parseRestriction( const TQDomElement&, SimpleType* ); + void parseComplexContent( const TQDomElement&, ComplexType* ); + void parseSimpleContent( const TQDomElement&, ComplexType* ); void resolveForwardElementRefs(); @@ -106,13 +106,13 @@ class Parser void resolveForwardDerivations(); bool shouldResolve(); - void importSchema( const QString &location ); + void importSchema( const TQString &location ); bool mElementQualified; bool mAttributeQualified; - QMap<QString, QString> mNameSpaceMap; - QString mNameSpace; - QString mPrefix; + TQMap<TQString, TQString> mNameSpaceMap; + TQString mNameSpace; + TQString mPrefix; TypesTable mTypesTable; Element::PtrList mElements; @@ -127,9 +127,9 @@ class Parser ComplexType::Derivation derivation; } ForwardDerivation; - QValueList<ForwardDerivation> mForwardDerivations; - QStringList mImportedSchemas; - QString mSchemaBaseUrl; + TQValueList<ForwardDerivation> mForwardDerivations; + TQStringList mImportedSchemas; + TQString mSchemaBaseUrl; }; } diff --git a/kode/kwsdl/schema/qualifiedname.cpp b/kode/kwsdl/schema/qualifiedname.cpp index 5b19f1669..350bca32f 100644 --- a/kode/kwsdl/schema/qualifiedname.cpp +++ b/kode/kwsdl/schema/qualifiedname.cpp @@ -24,7 +24,7 @@ using namespace Schema; -QualifiedName::QualifiedName( const QString &name ) +QualifiedName::QualifiedName( const TQString &name ) { parse( name ); } @@ -33,27 +33,27 @@ QualifiedName::QualifiedName() { } -void QualifiedName::operator=( const QString &name ) +void QualifiedName::operator=( const TQString &name ) { parse( name ); } -QString QualifiedName::localName() const +TQString QualifiedName::localName() const { return mLocalName; } -QString QualifiedName::prefix() const +TQString QualifiedName::prefix() const { return mPrefix; } -void QualifiedName::setNameSpace( const QString &nameSpace ) +void QualifiedName::setNameSpace( const TQString &nameSpace ) { mNameSpace = nameSpace; } -QString QualifiedName::nameSpace() const +TQString QualifiedName::nameSpace() const { return mNameSpace; } @@ -63,7 +63,7 @@ bool QualifiedName::operator==( const QualifiedName &qn ) const return (qn.nameSpace() == mNameSpace && qn.localName() == mLocalName ); } -void QualifiedName::parse( const QString &str ) +void QualifiedName::parse( const TQString &str ) { int pos = str.find( ':' ); if ( pos != -1 ) { diff --git a/kode/kwsdl/schema/qualifiedname.h b/kode/kwsdl/schema/qualifiedname.h index 5b2f59bcd..f879836cd 100644 --- a/kode/kwsdl/schema/qualifiedname.h +++ b/kode/kwsdl/schema/qualifiedname.h @@ -23,35 +23,35 @@ #ifndef SCHEMA_QUALIFIEDNAME_H #define SCHEMA_QUALIFIEDNAME_H -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> namespace Schema { class QualifiedName { public: - typedef QValueList<QualifiedName> List; + typedef TQValueList<QualifiedName> List; QualifiedName(); - QualifiedName( const QString &name ); + QualifiedName( const TQString &name ); - void operator=( const QString &name ); + void operator=( const TQString &name ); - QString localName() const; - QString prefix() const; + TQString localName() const; + TQString prefix() const; - void setNameSpace( const QString &nameSpace ); - QString nameSpace() const; + void setNameSpace( const TQString &nameSpace ); + TQString nameSpace() const; bool operator==( const QualifiedName& ) const; private: - void parse( const QString& ); + void parse( const TQString& ); - QString mNameSpace; - QString mLocalName; - QString mPrefix; + TQString mNameSpace; + TQString mLocalName; + TQString mPrefix; }; } diff --git a/kode/kwsdl/schema/simpletype.cpp b/kode/kwsdl/schema/simpletype.cpp index 6943563f4..d5dcf2fd9 100644 --- a/kode/kwsdl/schema/simpletype.cpp +++ b/kode/kwsdl/schema/simpletype.cpp @@ -31,7 +31,7 @@ SimpleType::SimpleType() { } -SimpleType::SimpleType( const QString &nameSpace ) +SimpleType::SimpleType( const TQString &nameSpace ) : mNameSpace( nameSpace ), mBaseType( 0 ), mContentModel( SIMPLE ), mRestriction( false ), mFacetId( NONE ), mAnonymous( false ), mSubType( TypeRestriction ), mListType( INVALID ) @@ -42,12 +42,12 @@ SimpleType::~SimpleType() { } -void SimpleType::setName( const QString &name ) +void SimpleType::setName( const TQString &name ) { mName = name; } -QString SimpleType::name() const +TQString SimpleType::name() const { return mName; } @@ -59,12 +59,12 @@ QualifiedName SimpleType::qualifiedName() const return qn; } -void SimpleType::setDocumentation( const QString &documentation ) +void SimpleType::setDocumentation( const TQString &documentation ) { mDocumentation = documentation; } -QString SimpleType::documentation() const +TQString SimpleType::documentation() const { return mDocumentation; } @@ -90,12 +90,12 @@ int SimpleType::baseType() const return mBaseType; } -void SimpleType::setBaseTypeName( const QString &baseTypeName ) +void SimpleType::setBaseTypeName( const TQString &baseTypeName ) { mBaseTypeName = baseTypeName; } -QString SimpleType::baseTypeName() const +TQString SimpleType::baseTypeName() const { return mBaseTypeName; } @@ -120,12 +120,12 @@ int SimpleType::listType() const return mListType; } -void SimpleType::setListTypeName( const QString &name ) +void SimpleType::setListTypeName( const TQString &name ) { mListTypeName = name; } -QString SimpleType::listTypeName() const +TQString SimpleType::listTypeName() const { return mListTypeName; } @@ -150,7 +150,7 @@ bool SimpleType::isAnonymous() const return mAnonymous; } -bool SimpleType::isValidFacet( const QString &facet ) +bool SimpleType::isValidFacet( const TQString &facet ) { if ( mBaseType == 0 ) { qDebug( "isValidFacet:Unknown base type" ); @@ -189,7 +189,7 @@ bool SimpleType::isValidFacet( const QString &facet ) return true; } -void SimpleType::setFacetValue( const QString &value ) +void SimpleType::setFacetValue( const TQString &value ) { int number = -1; @@ -255,7 +255,7 @@ int SimpleType::facetMaximumLength() const return mFacetValue.lenRange.maxlen; } -QStringList SimpleType::facetEnums() const +TQStringList SimpleType::facetEnums() const { return mEnums; } @@ -295,7 +295,7 @@ int SimpleType::facetFractionDigits() const return mFacetValue.frac; } -QString SimpleType::facetPattern() const +TQString SimpleType::facetPattern() const { return mFacetValue.pattern; } diff --git a/kode/kwsdl/schema/simpletype.h b/kode/kwsdl/schema/simpletype.h index 12d129a48..b82145f71 100644 --- a/kode/kwsdl/schema/simpletype.h +++ b/kode/kwsdl/schema/simpletype.h @@ -23,7 +23,7 @@ #ifndef SCHEMA_SIMPLETYPE_H #define SCHEMA_SIMPLETYPE_H -#include <qstringlist.h> +#include <tqstringlist.h> #include "qualifiedname.h" #include "xsdtype.h" @@ -33,7 +33,7 @@ namespace Schema { class SimpleType : public XSDType { public: - typedef QValueList<SimpleType> List; + typedef TQValueList<SimpleType> List; enum FacetType { @@ -67,16 +67,16 @@ class SimpleType : public XSDType }; SimpleType(); - SimpleType( const QString &nameSpace ); + SimpleType( const TQString &nameSpace ); ~SimpleType(); - void setName( const QString &name ); - QString name() const; + void setName( const TQString &name ); + TQString name() const; QualifiedName qualifiedName() const; - void setDocumentation( const QString &documentation ); - QString documentation() const; + void setDocumentation( const TQString &documentation ); + TQString documentation() const; void setType( int type ); int type() const; @@ -84,17 +84,17 @@ class SimpleType : public XSDType void setBaseType( int baseType ); int baseType() const; - void setBaseTypeName( const QString &baseTypeName ); - QString baseTypeName() const; + void setBaseTypeName( const TQString &baseTypeName ); + TQString baseTypeName() const; void setSubType( SubType subType ); SubType subType() const; void setListType( int listType ); - void setListTypeName( const QString &name ); + void setListTypeName( const TQString &name ); int listType() const; - QString listTypeName() const; + TQString listTypeName() const; void setContentModel( int contentModel ); int contentModel() const; @@ -102,15 +102,15 @@ class SimpleType : public XSDType void setAnonymous( bool anonymous ); bool isAnonymous() const; - bool isValidFacet( const QString &facet ); - void setFacetValue( const QString &value ); + bool isValidFacet( const TQString &facet ); + void setFacetValue( const TQString &value ); int facetType() const; int facetLength() const; int facetMinimumLength() const; int facetMaximumLength() const; - QStringList facetEnums() const; + TQStringList facetEnums() const; WhiteSpaceType facetWhiteSpace() const; int facetMinimumInclusive() const; int facetMaximumInclusive() const; @@ -118,24 +118,24 @@ class SimpleType : public XSDType int facetMaximumExclusive() const; int facetTotalDigits() const; int facetFractionDigits() const; - QString facetPattern() const; + TQString facetPattern() const; private: - QString mName; - QString mNameSpace; - QString mDocumentation; + TQString mName; + TQString mNameSpace; + TQString mDocumentation; int mType; int mBaseType; - QString mBaseTypeName; + TQString mBaseTypeName; int mContentModel; bool mRestriction; int mFacetId; bool mAnonymous; - QStringList mEnums; + TQStringList mEnums; SubType mSubType; int mListType; - QString mListTypeName; + TQString mListTypeName; typedef struct { @@ -151,7 +151,7 @@ class SimpleType : public XSDType } valRange; int tot; int frac; - QString pattern; + TQString pattern; } FacetValueType; diff --git a/kode/kwsdl/schema/typestable.cpp b/kode/kwsdl/schema/typestable.cpp index 8e0e66dd0..91a85f516 100644 --- a/kode/kwsdl/schema/typestable.cpp +++ b/kode/kwsdl/schema/typestable.cpp @@ -68,7 +68,7 @@ TypesTable::~TypesTable() void TypesTable::clear() { - QMap<QString, int>::Iterator it; + TQMap<TQString, int>::Iterator it; for ( it = mUserTypes.begin(); it != mUserTypes.end(); ++it ) delete typePtr( it.data() ); @@ -94,7 +94,7 @@ int TypesTable::extRefType( int index ) const int TypesTable::addType( XSDType *type ) { QualifiedName qn = type->qualifiedName(); - QString type_name( qn.localName() ); + TQString type_name( qn.localName() ); int i = 0; @@ -146,12 +146,12 @@ int TypesTable::typeId( const QualifiedName &name, bool create ) return typeId; } -QString TypesTable::typeName( int id ) const +TQString TypesTable::typeName( int id ) const { if ( id < 0 ) - return QString(); + return TQString(); - QMap<QString, int>::ConstIterator it; + TQMap<TQString, int>::ConstIterator it; if ( id >= 0 && id <= XSDType::ANYURI ) { for ( it = mBasicTypes.begin(); it != mBasicTypes.end(); ++it ) @@ -204,7 +204,7 @@ bool TypesTable::detectUndefinedTypes() return false; } -void TypesTable::resolveForwardElementRefs( const QString &name, Element &element ) +void TypesTable::resolveForwardElementRefs( const TQString &name, Element &element ) { for ( int i = 0; i < (int)mTypes.count(); i++ ) if ( mTypes[i] != 0 ) { @@ -215,7 +215,7 @@ void TypesTable::resolveForwardElementRefs( const QString &name, Element &elemen } } -void TypesTable::resolveForwardAttributeRefs( const QString &name, Attribute &attribute ) +void TypesTable::resolveForwardAttributeRefs( const TQString &name, Attribute &attribute ) { for ( int i = 0; i < (int)mTypes.count(); i++ ) if ( mTypes[i] != 0 ) { @@ -240,12 +240,12 @@ int TypesTable::numTypes() const return mTypes.count(); } -void TypesTable::setTargetNamespace( const QString &nameSpace ) +void TypesTable::setTargetNamespace( const TQString &nameSpace ) { mNameSpace = nameSpace; } -QString TypesTable::targetNamespace() const +TQString TypesTable::targetNamespace() const { return mNameSpace; } diff --git a/kode/kwsdl/schema/typestable.h b/kode/kwsdl/schema/typestable.h index 6dfa378ed..a6ca8bf22 100644 --- a/kode/kwsdl/schema/typestable.h +++ b/kode/kwsdl/schema/typestable.h @@ -23,8 +23,8 @@ #ifndef SCHEMA_TYPESTABLE_H #define SCHEMA_TYPESTABLE_H -#include <qmap.h> -#include <qstring.h> +#include <tqmap.h> +#include <tqstring.h> #include "complextype.h" #include "simpletype.h" @@ -44,7 +44,7 @@ class TypesTable int typeId( const QualifiedName &name, bool create = false ); - QString typeName( int id ) const; + TQString typeName( int id ) const; int addExternalTypeId( const QualifiedName &type, XSDType *type ); @@ -52,8 +52,8 @@ class TypesTable QualifiedName extRefName( int index ) const; int extRefType( int index ) const; - void resolveForwardElementRefs( const QString &name, Element &element ); - void resolveForwardAttributeRefs( const QString &name, Attribute &attribute ); + void resolveForwardElementRefs( const TQString &name, Element &element ); + void resolveForwardAttributeRefs( const TQString &name, Attribute &attribute ); XSDType *typePtr( int id ) const; @@ -61,19 +61,19 @@ class TypesTable bool detectUndefinedTypes(); - void setTargetNamespace( const QString &nameSpace ); - QString targetNamespace() const; + void setTargetNamespace( const TQString &nameSpace ); + TQString targetNamespace() const; private: - QValueList<XSDType*> mTypes; + TQValueList<XSDType*> mTypes; //maintains a map of all user defined type names and their ids - QMap<QString, int> mUserTypes; - QMap<QString, int> mBasicTypes; + TQMap<TQString, int> mUserTypes; + TQMap<TQString, int> mBasicTypes; int mCurrentId; - QString mNameSpace; + TQString mNameSpace; struct ExternRef { @@ -81,7 +81,7 @@ class TypesTable QualifiedName qname; }; - QValueList<struct ExternRef> mExternRefs; + TQValueList<struct ExternRef> mExternRefs; }; } diff --git a/kode/kwsdl/schema/xsdtype.h b/kode/kwsdl/schema/xsdtype.h index b1bc4a7f8..b1077ebe5 100644 --- a/kode/kwsdl/schema/xsdtype.h +++ b/kode/kwsdl/schema/xsdtype.h @@ -23,20 +23,20 @@ #ifndef SCHEMA_XSDTYPE_H #define SCHEMA_XSDTYPE_H -#include <qstring.h> -#include <qvaluelist.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqvaluelist.h> +#include <tqmap.h> #include "qualifiedname.h" namespace Schema { -const QString SchemaUri = "http://www.w3.org/2001/XMLSchema"; +const TQString SchemaUri = "http://www.w3.org/2001/XMLSchema"; class XSDType { public: - typedef QValueList<const XSDType*> List; + typedef TQValueList<const XSDType*> List; enum { @@ -78,7 +78,7 @@ class XSDType ANYURI }; - XSDType( const QString& ) + XSDType( const TQString& ) { }; @@ -90,9 +90,9 @@ class XSDType { }; - virtual QString name() const = 0; + virtual TQString name() const = 0; virtual QualifiedName qualifiedName() const = 0; - virtual QString documentation() const = 0; + virtual TQString documentation() const = 0; virtual int contentModel() const = 0; virtual int type() const = 0; virtual bool isAnonymous() const = 0; @@ -102,8 +102,8 @@ class XSDType return true; } - virtual void setName( const QString& ) = 0; - virtual void setDocumentation( const QString& ) = 0; + virtual void setName( const TQString& ) = 0; + virtual void setDocumentation( const TQString& ) = 0; virtual void setContentModel( int ) = 0; virtual void setType( int ) = 0; virtual void setAnonymous( bool ) = 0; |