diff options
Diffstat (limited to 'kode/kwsdl')
-rw-r--r-- | kode/kwsdl/compiler.cpp | 2 | ||||
-rw-r--r-- | kode/kwsdl/converter.cpp | 2 | ||||
-rw-r--r-- | kode/kwsdl/kung/loader.cpp | 2 | ||||
-rw-r--r-- | kode/kwsdl/namemapper.cpp | 2 | ||||
-rw-r--r-- | kode/kwsdl/parser.cpp | 2 | ||||
-rw-r--r-- | kode/kwsdl/schema/parser.cpp | 2 | ||||
-rw-r--r-- | kode/kwsdl/schema/qualifiedname.cpp | 2 | ||||
-rw-r--r-- | kode/kwsdl/schema/simpletype.cpp | 2 | ||||
-rw-r--r-- | kode/kwsdl/typemapper.cpp | 18 |
9 files changed, 17 insertions, 17 deletions
diff --git a/kode/kwsdl/compiler.cpp b/kode/kwsdl/compiler.cpp index 507e8bd52..e3ccf4f8c 100644 --- a/kode/kwsdl/compiler.cpp +++ b/kode/kwsdl/compiler.cpp @@ -39,7 +39,7 @@ Compiler::Compiler() void Compiler::setWSDLUrl( const TQString &wsdlUrl ) { mWSDLUrl = wsdlUrl; - mWSDLBaseUrl = mWSDLUrl.left( mWSDLUrl.tqfindRev( '/' ) ); + mWSDLBaseUrl = mWSDLUrl.left( mWSDLUrl.findRev( '/' ) ); mParser.setSchemaBaseUrl( mWSDLBaseUrl ); } diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp index 173ca7fb3..f8d258013 100644 --- a/kode/kwsdl/converter.cpp +++ b/kode/kwsdl/converter.cpp @@ -32,7 +32,7 @@ static TQString escapeEnum( const TQString &str ) { TQString enumStr = capitalize( str ); - return enumStr.tqreplace( "-", "_" ); + return enumStr.replace( "-", "_" ); } Converter::Converter() diff --git a/kode/kwsdl/kung/loader.cpp b/kode/kwsdl/kung/loader.cpp index 41f965bc2..8b0281ac8 100644 --- a/kode/kwsdl/kung/loader.cpp +++ b/kode/kwsdl/kung/loader.cpp @@ -35,7 +35,7 @@ Loader::Loader() void Loader::setWSDLUrl( const TQString &wsdlUrl ) { mWSDLUrl = wsdlUrl; - mWSDLBaseUrl = mWSDLUrl.left( mWSDLUrl.tqfindRev( '/' ) ); + mWSDLBaseUrl = mWSDLUrl.left( mWSDLUrl.findRev( '/' ) ); mParser.setSchemaBaseUrl( mWSDLBaseUrl ); } diff --git a/kode/kwsdl/namemapper.cpp b/kode/kwsdl/namemapper.cpp index 6d7ae6399..426498f5c 100644 --- a/kode/kwsdl/namemapper.cpp +++ b/kode/kwsdl/namemapper.cpp @@ -30,7 +30,7 @@ NameMapper::NameMapper() TQString NameMapper::escape( const TQString &name ) const { - if ( mKeyWords.tqcontains( name ) ) + if ( mKeyWords.contains( name ) ) return "_" + name; else return name; diff --git a/kode/kwsdl/parser.cpp b/kode/kwsdl/parser.cpp index b8512490b..6e2a37dc0 100644 --- a/kode/kwsdl/parser.cpp +++ b/kode/kwsdl/parser.cpp @@ -27,7 +27,7 @@ using namespace KWSDL; static TQString sns( const TQString &str ) { - int pos = str.tqfind( ':' ); + int pos = str.find( ':' ); if ( pos != -1 ) return str.mid( pos + 1 ); else diff --git a/kode/kwsdl/schema/parser.cpp b/kode/kwsdl/schema/parser.cpp index 4571f5cc6..148599751 100644 --- a/kode/kwsdl/schema/parser.cpp +++ b/kode/kwsdl/schema/parser.cpp @@ -200,7 +200,7 @@ void Parser::parseImport( const TQDomElement &element ) TQString location = element.attribute( "schemaLocation" ); if ( !location.isEmpty() ) { // don't import a schema twice - if ( mImportedSchemas.tqcontains( location ) ) + if ( mImportedSchemas.contains( location ) ) return; else mImportedSchemas.append( location ); diff --git a/kode/kwsdl/schema/qualifiedname.cpp b/kode/kwsdl/schema/qualifiedname.cpp index 41e6fd849..350bca32f 100644 --- a/kode/kwsdl/schema/qualifiedname.cpp +++ b/kode/kwsdl/schema/qualifiedname.cpp @@ -65,7 +65,7 @@ bool QualifiedName::operator==( const QualifiedName &qn ) const void QualifiedName::parse( const TQString &str ) { - int pos = str.tqfind( ':' ); + int pos = str.find( ':' ); if ( pos != -1 ) { mPrefix = str.left( pos ); mLocalName = str.mid( pos + 1 ); diff --git a/kode/kwsdl/schema/simpletype.cpp b/kode/kwsdl/schema/simpletype.cpp index 50242808f..d5dcf2fd9 100644 --- a/kode/kwsdl/schema/simpletype.cpp +++ b/kode/kwsdl/schema/simpletype.cpp @@ -202,7 +202,7 @@ void SimpleType::setFacetValue( const TQString &value ) mFacetValue.wsp = PRESERVE; else if ( value == "collapse" ) mFacetValue.wsp = COLLAPSE; - else if ( value == "tqreplace" ) + else if ( value == "replace" ) mFacetValue.wsp = REPLACE; else { qDebug( "Invalid facet value for whitespace" ); diff --git a/kode/kwsdl/typemapper.cpp b/kode/kwsdl/typemapper.cpp index 024b4f42d..3ec0a20a3 100644 --- a/kode/kwsdl/typemapper.cpp +++ b/kode/kwsdl/typemapper.cpp @@ -71,7 +71,7 @@ TQString TypeMapper::type( const Schema::Element *element ) const TQString type; // check basic types - TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName ); + TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName ); if ( it != mMap.end() ) type = it.data().type; @@ -89,7 +89,7 @@ TQString TypeMapper::type( const Schema::Attribute *attribute ) const TQString type; // check basic types - TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName ); + TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName ); if ( it != mMap.end() ) type = it.data().type; @@ -104,7 +104,7 @@ TQString TypeMapper::type( const Schema::Attribute *attribute ) const TQString TypeMapper::type( const TQString &typeName ) const { // check basic types - TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName ); + TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName ); if ( it != mMap.end() ) return it.data().type; @@ -147,7 +147,7 @@ TQStringList TypeMapper::header( const Schema::Element *element ) const TQStringList headers; // check basic types - TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName ); + TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName ); if ( it != mMap.end() ) { if ( !it.data().header.isEmpty() ) headers.append( it.data().header ); @@ -167,7 +167,7 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const Schema::Element *element TQMap<TQString, TQString> headers; // check basic types - TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName ); + TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName ); if ( it != mMap.end() ) { if ( !it.data().header.isEmpty() ) { if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING ) @@ -193,7 +193,7 @@ TQStringList TypeMapper::header( const Schema::Attribute *attribute ) const TQStringList headers; // check basic types - TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName ); + TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName ); if ( it != mMap.end() ) { if ( !it.data().header.isEmpty() ) headers.append( it.data().header ); @@ -210,7 +210,7 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const Schema::Attribute *attrib TQMap<TQString, TQString> headers; // check basic types - TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName ); + TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName ); if ( it != mMap.end() ) { if ( !it.data().header.isEmpty() ) { if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING ) @@ -228,7 +228,7 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const Schema::Attribute *attrib TQStringList TypeMapper::header( const TQString &typeName ) const { - TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName ); + TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName ); if ( it != mMap.end() ) return it.data().header; @@ -249,7 +249,7 @@ TQMap<TQString, TQString> TypeMapper::headerDec( const TQString &typeName ) cons TQMap<TQString, TQString> headers; // check basic types - TQMap<TQString, TypeInfo>::ConstIterator it = mMap.tqfind( typeName ); + TQMap<TQString, TypeInfo>::ConstIterator it = mMap.find( typeName ); if ( it != mMap.end() ) { if ( !it.data().header.isEmpty() ) { if ( it.data().type == TQBYTEARRAY_OBJECT_NAME_STRING ) |