rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 15 insertions, 15 deletions

diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp
index 52e6d8ae..3b2d3efb 100644
--- a/lib/kofficecore/KoXmlReader.cpp
+++ b/lib/kofficecore/KoXmlReader.cpp
@@ -173,7 +173,7 @@ public:
   TQString nodeName() const;
 
   // for tree and linked-list
-  KoXmlNodeData* tqparent;
+  KoXmlNodeData* parent;
   KoXmlNodeData* prev;
   KoXmlNodeData* next;
   KoXmlNodeData* first;
@@ -295,7 +295,7 @@ KoXmlNodeData::KoXmlNodeData()
   textData = TQString();
 
   count = 1;
-  tqparent = 0;
+  parent = 0;
   prev = next = 0;
   first = last = 0;
 
@@ -333,7 +333,7 @@ void KoXmlNodeData::clear()
   attr.clear();
   attrNS.clear();
 
-  tqparent = 0;
+  parent = 0;
   prev = next = 0;
   first = last = 0;
 
@@ -389,15 +389,15 @@ KoXmlNodeData* KoXmlNodeData::ownerDocument()
 {
   KoXmlNodeData* owner = this;
 
-  while( owner->tqparent ) 
-    owner = owner->tqparent;
+  while( owner->parent ) 
+    owner = owner->parent;
 
   return (owner->nodeType==KoXmlNode::DocumentNode) ? owner : 0;
 }
 
 void KoXmlNodeData::appendChild( KoXmlNodeData* node )
 {
-  node->tqparent = this;
+  node->parent = this;
   if( !last )
     first = last = node;
   else
@@ -678,7 +678,7 @@ const TQString& name, const TQXmlAttributes& atts )
       // construct a new element
       element = new KoXmlNodeData;
       element->nodeType = KoXmlNode::ElementNode;
-      element->tqparent = currentNode;
+      element->parent = currentNode;
       element->namespaceURI = nsURI;
       element->prefix = nodePrefix;
       element->localName = nodeLocalName;
@@ -744,7 +744,7 @@ const TQString& name, const TQXmlAttributes& atts )
       // construct a new element
       element = new KoXmlNodeData;
       element->nodeType = KoXmlNode::ElementNode;
-      element->tqparent = currentNode;
+      element->parent = currentNode;
       element->namespaceURI = TQString();
       element->prefix = TQString();
       element->localName = TQString();
@@ -810,7 +810,7 @@ const TQString& qName )
   
   // sanity check
   if( !currentNode ) return false;
-  if( !currentNode->tqparent ) return false;
+  if( !currentNode->parent ) return false;
 
   // see comments in startElement about first element and on-demand loading
   if( rootNode->nodeType == KoXmlNode::DocumentNode )
@@ -826,7 +826,7 @@ const TQString& qName )
 
   // go up one level
   if( elementDepth <= maxDepth )
-    currentNode = currentNode->tqparent;
+    currentNode = currentNode->parent;
 
   // we are going up one level
   elementDepth--;
@@ -856,7 +856,7 @@ bool KoXmlHandler::characters( const TQString& str )
     {
       KoXmlNodeData* cdata = new KoXmlNodeData;
       cdata->nodeType = KoXmlNode::CDATASectionNode;
-      cdata->tqparent = currentNode;
+      cdata->parent = currentNode;
       cdata->setData( str );
       currentNode->appendChild( cdata );
     }
@@ -871,7 +871,7 @@ bool KoXmlHandler::characters( const TQString& str )
     {
       KoXmlNodeData* text = new KoXmlNodeData;
       text->nodeType = KoXmlNode::TextNode;
-      text->tqparent = currentNode;
+      text->parent = currentNode;
       text->setData( str );
       currentNode->appendChild( text );
     }
@@ -893,7 +893,7 @@ const TQString& data )
   
   KoXmlNodeData* instruction = new KoXmlNodeData;
   instruction->nodeType = KoXmlNode::ProcessingInstructionNode;
-  instruction->tqparent = currentNode;
+  instruction->parent = currentNode;
   instruction->tagName = target;
   instruction->setData( data );
 
@@ -1101,7 +1101,7 @@ TQString KoXmlNode::localName() const
 KoXmlDocument KoXmlNode::ownerDocument() const
 {
   KoXmlNodeData* node = d; 
-  while( node->tqparent ) node = node->tqparent;
+  while( node->parent ) node = node->parent;
 
   if( node->nodeType != DocumentNode ) return KoXmlDocument();  
   return KoXmlDocument( node );
@@ -1109,7 +1109,7 @@ KoXmlDocument KoXmlNode::ownerDocument() const
 
 KoXmlNode KoXmlNode::parentNode() const
 {
-  return d->tqparent ? KoXmlNode( d->tqparent ) : KoXmlNode();
+  return d->parent ? KoXmlNode( d->parent ) : KoXmlNode();
 }
 
 bool KoXmlNode::hasChildNodes() const