rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 22 insertions, 22 deletions

diff --git a/quanta/parsers/node.cpp b/quanta/parsers/node.cpp
index 591b557e..0589855a 100644
--- a/quanta/parsers/node.cpp
+++ b/quanta/parsers/node.cpp
@@ -33,9 +33,9 @@ int NN = 0; //for debugging purposes: count the Node objects
 
 GroupElementMapList globalGroupMap;
 
-Node::Node(Node *tqparent)
+Node::Node(Node *parent)
 {
-  this->tqparent = tqparent;
+  this->parent = parent;
   prev = next = child = 0L;
   tag = 0L;
   mainListItem = 0L;
@@ -89,8 +89,8 @@ Node::~Node()
   nodes.erase(this);
   if (prev && prev->next == this)
       prev->next = 0L;
-  if (tqparent && tqparent->child == this)
-      tqparent->child = 0L;
+  if (parent && parent->child == this)
+      parent->child = 0L;
   if (removeAll)
   {
     deleteNode(child);
@@ -101,8 +101,8 @@ Node::~Node()
   {
     if (next && next->prev == this)
       next->prev = 0L;
-    if (child && child->tqparent == this)
-      child->tqparent = 0L;
+    if (child && child->parent == this)
+      child->parent = 0L;
   }
 
   delete tag;
@@ -174,13 +174,13 @@ bool Node::load(TQDomElement const& element)
             {
                 next = new Node(0);
                 next->prev = this;
-                next->tqparent = this->tqparent;
+                next->parent = this->parent;
                 next->load(e);
             }
             else if(e.tagName() == "nodeChild")
             {
                 child = new Node(0);
-                child->tqparent = this;
+                child->parent = this;
                 child->load(e);
             }
             else if(e.tagName() == "nodeClosing")
@@ -225,14 +225,14 @@ Node *Node::nextSibling()
             Node *n = this;
             while (n)
             {
-                if (n->tqparent && n->tqparent->next)
+                if (n->parent && n->parent->next)
                 {
-                    result = n->tqparent->next;
+                    result = n->parent->next;
                     break;
                 }
                 else
                 {
-                    n = n->tqparent;
+                    n = n->parent;
                 }
             }
         }
@@ -257,7 +257,7 @@ Node *Node::previousSibling()
     }
     else
     {
-        result = tqparent;
+        result = parent;
     }
 
     return result;
@@ -272,14 +272,14 @@ Node *Node::nextNotChild()
         Node *n = this;
         while (n)
         {
-            if (n->tqparent && n->tqparent->next)
+            if (n->parent && n->parent->next)
             {
-                n = n->tqparent->next;
+                n = n->parent->next;
                 break;
             }
             else
             {
-                n = n->tqparent;
+                n = n->parent;
             }
         }
 
@@ -358,15 +358,15 @@ Node *Node::SPrev()
     Node *node = prev;
     int bCol, bLine, eCol, eLine, col, line;
 
-    if(tqparent)
+    if(parent)
     {
-        tqparent->tag->beginPos(bLine, bCol);
-        tqparent->tag->endPos(eLine, eCol);
+        parent->tag->beginPos(bLine, bCol);
+        parent->tag->endPos(eLine, eCol);
     }
 
     while(node && node->tag->type != Tag::XmlTag && node->tag->type != Tag::Text)
     {
-        if (tqparent && node->tag->type == Tag::ScriptTag)
+        if (parent && node->tag->type == Tag::ScriptTag)
         {
             //Check if it is an embedded ScriptTag. If it is, continue.
             node->tag->beginPos(line, col);
@@ -384,7 +384,7 @@ Node *Node::SNext()
     Node *node = next;
     int bCol, bLine, eCol, eLine, col, line;
 
-    if(tqparent)
+    if(parent)
     {
         tag->beginPos(bLine, bCol);
         tag->endPos(eLine, eCol);
@@ -392,7 +392,7 @@ Node *Node::SNext()
 
     while(node && node->tag->type != Tag::XmlTag && node->tag->type != Tag::Text)
     {
-        if (tqparent && node->tag->type == Tag::ScriptTag)
+        if (parent && node->tag->type == Tag::ScriptTag)
         {
             //Check if it is an embedded ScriptTag. If it is, continue.
             node->tag->beginPos(line, col);
@@ -509,7 +509,7 @@ void Node::operator =(Node* node)
   (*this) = (*node);
   prev = 0L;
   next = 0L;
-  tqparent = 0L;
+  parent = 0L;
   child = 0L;
   mainListItem = 0L;
   m_groupElements.clear();