1 files changed, 12 insertions, 12 deletions

diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp
index 2117c59c..41e7e0a9 100644
--- a/kode/kwsdl/converter.cpp
+++ b/kode/kwsdl/converter.cpp
@@ -37,7 +37,7 @@ static TQString escapeEnum( const TQString &str )
 
 Converter::Converter()
 {
-  mTQObject = KODE::Class( TQOBJECT_OBJECT_NAME_STRING );
+  mTQObject = KODE::Class( "TQObject" );
 }
 
 void Converter::setWSDL( const WSDL &wsdl )
@@ -249,7 +249,7 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
         escapedEnums.append( escapeEnum( enums[ i ] ) );
 
       // marshal value
-      KODE::Function marshalValue( "marshalValue", TQSTRING_OBJECT_NAME_STRING );
+      KODE::Function marshalValue( "marshalValue", "TQString" );
       marshalValue.setStatic( true );
       marshalValue.addArgument( "const " + typeName + "* value" );
       code += "switch ( value->type() ) {";
@@ -315,7 +315,7 @@ void Converter::createSimpleTypeSerializer( const Schema::SimpleType *type )
       demarshalCode.unindent();
       demarshalCode += "}";
 
-      KODE::Function marshalValue( "marshalValue", TQSTRING_OBJECT_NAME_STRING );
+      KODE::Function marshalValue( "marshalValue", "TQString" );
       marshalValue.setStatic( true );
       marshalValue.addArgument( "const " + typeName + "* value" );
       marshalValue.setBody( "return Serializer::marshalValue( value->value() );" );
@@ -689,9 +689,9 @@ void Converter::convertService( const Service &service )
       KODE::MemberVariable transport( inputMessage.name() + "Transport", "Transport" );
       ctorCode += transport.name() + " = new Transport( \"" + (*it).mLocation + "\" );";
 
-      ctorCode += "connect( " + transport.name() + ", TQT_SIGNAL( result( const TQString& ) ),";
+      ctorCode += "connect( " + transport.name() + ", TQ_SIGNAL( result( const TQString& ) ),";
       ctorCode.indent();
-      ctorCode += "this, TQT_SLOT( " + outputMessage.name() + "Slot( const TQString& ) ) );";
+      ctorCode += "this, TQ_SLOT( " + outputMessage.name() + "Slot( const TQString& ) ) );";
       ctorCode.unindent();
 
       dtorCode += "delete " + transport.name() + ";";
@@ -839,7 +839,7 @@ void Converter::createUtilClasses()
     of typing and is easier to maintain at the end ;)
    */
   TypeEntry types[] = {
-    { TQSTRING_OBJECT_NAME_STRING, "xsd:string", "*value", "str" },
+    { "TQString", "xsd:string", "*value", "str" },
     { "bool", "xsd:boolean", "(*value ? \"true\" : \"false\")", "(str.lower() == \"true\" ? true : false)" },
     { "float", "xsd:TODO", "TQString::number( *value )", "str.toFloat()" },
     { "int", "xsd:int", "TQString::number( *value )", "str.toInt()" },
@@ -848,7 +848,7 @@ void Converter::createUtilClasses()
     { "char", "xsd:byte", "TQString( TQChar( *value ) )", "str[ 0 ].latin1()" },
     { "unsigned char", "xsd:unsignedByte", "TQString( TQChar( *value ) )", "str[ 0 ].latin1()" },
     { "short", "xsd:short", "TQString::number( *value )", "str.toShort()" },
-    { TQBYTEARRAY_OBJECT_NAME_STRING, "xsd:base64Binary", "TQString::fromUtf8( KCodecs::base64Encode( *value ) )", "KCodecs::base64Decode( str.utf8() )" },
+    { "TQByteArray", "xsd:base64Binary", "TQString::fromUtf8( KCodecs::base64Encode( *value ) )", "KCodecs::base64Decode( str.utf8() )" },
     { "TQDateTime", "xsd:dateTime", "value->toString( TQt::ISODate )", "TQDateTime::fromString( str, TQt::ISODate )" },
     { "TQDate", "xsd:date", "value->toString( TQt::ISODate )", "TQDate::fromString( str, TQt::ISODate )" }
   };
@@ -859,7 +859,7 @@ void Converter::createUtilClasses()
 
     TypeEntry entry = types[ i ]; 
 
-    marshal = KODE::Function( "marshalValue", TQSTRING_OBJECT_NAME_STRING );
+    marshal = KODE::Function( "marshalValue", "TQString" );
     marshal.setStatic( true );
     marshal.addArgument( "const " + entry.type + "* value" );
 
@@ -911,10 +911,10 @@ void Converter::createTransportClass()
 
   transport.addInclude( "kdebug.h" );
 
-  KODE::MemberVariable url( "url", TQSTRING_OBJECT_NAME_STRING );
+  KODE::MemberVariable url( "url", "TQString" );
   transport.addMemberVariable( url );
 
-  KODE::MemberVariable slotDataVar( "data", TQBYTEARRAY_OBJECT_NAME_STRING );
+  KODE::MemberVariable slotDataVar( "data", "TQByteArray" );
   transport.addMemberVariable( slotDataVar );
 
   // ctor
@@ -946,8 +946,8 @@ void Converter::createTransportClass()
   queryCode += "job->addMetaData( \"UserAgent\", \"KWSDL\" );";
   queryCode += "job->addMetaData( \"content-type\", \"Content-Type: text/xml; charset=utf-8\" );";
   queryCode.newLine();
-  queryCode += "connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );";
-  queryCode += "connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );";
+  queryCode += "connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );";
+  queryCode += "connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );";
 
   query.setBody( queryCode );