2 files changed, 9 insertions, 9 deletions

diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp
index 25e91edce..66dccccbb 100644
--- a/kode/kxml_compiler/creator.cpp
+++ b/kode/kxml_compiler/creator.cpp
@@ -95,7 +95,7 @@ void Creator::createProperty( KODE::Class &c, const TQString &type,
 void Creator::createElementFunctions( KODE::Class &c, Element *e )
 {
   if ( e->hasText ) {
-    createProperty( c, "TQString", e->name );
+    createProperty( c, TQSTRING_OBJECT_NAME_STRING, e->name );
     if ( mXmlParserType == XmlParserCustomExternal ) {
       createTextElementParserCustom( c, e );
     }
@@ -137,7 +137,7 @@ void Creator::createClass( Element *element )
 {
   TQString className = upperFirst( element->name );
 
-  if ( mProcessedClasses.find( className ) != mProcessedClasses.end() ) {
+  if ( mProcessedClasses.tqfind( className ) != mProcessedClasses.end() ) {
     return;
   }
 
@@ -150,7 +150,7 @@ void Creator::createClass( Element *element )
        itA != element->attributes.end(); ++itA ) {
     Attribute *a = *itA;
 
-    createProperty( c, "TQString", a->name );
+    createProperty( c, TQSTRING_OBJECT_NAME_STRING, a->name );
   }
 
   TQValueList<Element *>::ConstIterator itE;
@@ -176,7 +176,7 @@ void Creator::createClass( Element *element )
 
 void Creator::createElementWriter( KODE::Class &c, Element *element )
 {
-  KODE::Function writer( "writeElement", "TQString" );
+  KODE::Function writer( "writeElement", TQSTRING_OBJECT_NAME_STRING );
   
   KODE::Code code;
   
@@ -268,7 +268,7 @@ void Creator::createElementParser( KODE::Class &c, Element *e )
 
 void Creator::createTextElementParserCustom( KODE::Class &, Element *e )
 {
-  KODE::Function parser( "parseElement" + upperFirst( e->name ), "TQString" );
+  KODE::Function parser( "parseElement" + upperFirst( e->name ), TQSTRING_OBJECT_NAME_STRING );
 
   KODE::Code code;
   
@@ -637,7 +637,7 @@ void Creator::createListTypedefs()
 
 void Creator::createIndenter( KODE::File &file )
 {
-  KODE::Function indenter( "indent", "TQString" );
+  KODE::Function indenter( "indent", TQSTRING_OBJECT_NAME_STRING );
   indenter.addArgument( "int n = 0" );
   
   KODE::Code code;
@@ -724,7 +724,7 @@ void Creator::createFileParserCustom( Element *element )
   mParserClass.addInclude( "kdebug.h" );
 
   mParserClass.addMemberVariable( KODE::MemberVariable( "mBuffer",
-                                                        "TQString" ) );
+                                                        TQSTRING_OBJECT_NAME_STRING ) );
   mParserClass.addMemberVariable( KODE::MemberVariable( "mRunning",
                                                         "unsigned int" ) );
 
diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp
index 59392ca84..0d5ddf154 100644
--- a/kode/kxml_compiler/parser.cpp
+++ b/kode/kxml_compiler/parser.cpp
@@ -97,7 +97,7 @@ Element *Parser::parse( const TQDomElement &docElement )
       parseElement( e1, d, Pattern() );
       Element::List definitions;
       TQMap<TQString,Element::List >::ConstIterator it; 
-      it = mDefinitionMap.find( d->name );
+      it = mDefinitionMap.tqfind( d->name );
       if ( it != mDefinitionMap.end() ) definitions = *it;
       definitions.append( d );
       mDefinitionMap.tqreplace( d->name, definitions );
@@ -192,7 +192,7 @@ void Parser::substituteReferences( Element *s )
       r->substituted = true;
     }
     TQMap<TQString,Element::List >::ConstIterator it1;
-    it1 = mDefinitionMap.find( r->name );
+    it1 = mDefinitionMap.tqfind( r->name );
     if ( it1 != mDefinitionMap.end() ) {
       Element::List elements = *it1;
       Element::List::ConstIterator it4;