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

18 files changed, 320 insertions, 320 deletions

diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp
index 33ad81ac..c8d4c6c9 100644
--- a/quanta/parts/kafka/domtreeview.cpp
+++ b/quanta/parts/kafka/domtreeview.cpp
@@ -27,7 +27,7 @@
 
 #include "domtreeview.moc"
 
-DOMTreeView::DOMTreeView(TQWidget *tqparent, KHTMLPart *currentpart, const char * name) : KListView(tqparent, name)
+DOMTreeView::DOMTreeView(TQWidget *parent, KHTMLPart *currentpart, const char * name) : KListView(parent, name)
 {
     setCaption(name);
     setRootIsDecorated(true);
@@ -137,8 +137,8 @@ void DOMTreeView::slotItemClicked(TQListViewItem *cur_item)
     }
 }
 
-KafkaDOMTreeDialog::KafkaDOMTreeDialog(TQWidget *tqparent, KHTMLPart *part, const char* name, bool modal, WFlags fl )
-	: TQDialog(tqparent, name, modal, fl)
+KafkaDOMTreeDialog::KafkaDOMTreeDialog(TQWidget *parent, KHTMLPart *part, const char* name, bool modal, WFlags fl )
+	: TQDialog(parent, name, modal, fl)
 {
 	tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) );
 	DialogLayout = new TQGridLayout( this, 1, 1, 11, 6, "DialogLayout");
diff --git a/quanta/parts/kafka/domtreeview.h b/quanta/parts/kafka/domtreeview.h
index 2f3ea65a..7c18dc60 100644
--- a/quanta/parts/kafka/domtreeview.h
+++ b/quanta/parts/kafka/domtreeview.h
@@ -40,7 +40,7 @@ class DOMTreeView : public KListView
     Q_OBJECT
   TQ_OBJECT
     public:
-	DOMTreeView(TQWidget *tqparent, KHTMLPart *part, const char * name = 0);
+	DOMTreeView(TQWidget *parent, KHTMLPart *part, const char * name = 0);
 	~DOMTreeView();
         void setTitle(const TQString &str);
 	void recursive(const DOM::Node &pNode, const DOM::Node &node);
@@ -69,7 +69,7 @@ class KafkaDOMTreeDialog : public TQDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KafkaDOMTreeDialog(TQWidget *tqparent = 0, KHTMLPart *part = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+	KafkaDOMTreeDialog(TQWidget *parent = 0, KHTMLPart *part = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~KafkaDOMTreeDialog();
 	DOMTreeView *domview;
 	TQGridLayout *DialogLayout;
diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp
index d6b38cb7..9d23cada 100644
--- a/quanta/parts/kafka/htmldocumentproperties.cpp
+++ b/quanta/parts/kafka/htmldocumentproperties.cpp
@@ -44,9 +44,9 @@
 
 #include "viewmanager.h"
 
-htmlDocumentProperties::htmlDocumentProperties( TQWidget* tqparent, bool forceInsertionOfBasicNodes, const char* name,
+htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInsertionOfBasicNodes, const char* name,
  	bool modal, WFlags fl) :
-	htmlDocumentPropertiesui(tqparent, name, modal, fl), titleNode( 0L ), htmlNode( 0L ),
+	htmlDocumentPropertiesui(parent, name, modal, fl), titleNode( 0L ), htmlNode( 0L ),
 	headNode( 0L ), linkNode( 0L ), bodyNode( 0L), doctypeNode( 0L ), CSSNode ( 0L ),
 	xmlNode( 0L ), titleDirty(false), linkDirty(false)
 {
@@ -651,7 +651,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs)
 		htmlNode->child = allTheNodes;
 		while(allTheNodes)
 		{
-			allTheNodes->tqparent = htmlNode;
+			allTheNodes->parent = htmlNode;
 			allTheNodes = allTheNodes->next;
 		}
 		htmlNodeCreated = true;
@@ -685,7 +685,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs)
 		if(qHead->isChild(allTheNodes))
 		{
 			/*//TODO:LOG this into the modif!!
-			allTheNodes->tqparent = headNode;
+			allTheNodes->parent = headNode;
 			if(lastHeadChild)
 			{
 				lastHeadChild->next = allTheNodes;
@@ -701,7 +701,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs)
 		else if(bodyNodeCreated && htmlNodeCreated && qBody->isChild(allTheNodes))
 		{
 			//TODO:log!!
-			/**allTheNodes->tqparent = bodyNode;
+			/**allTheNodes->parent = bodyNode;
 			if(lastBodyChild)
 			{
 				lastBodyChild->next = allTheNodes;
@@ -717,7 +717,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs)
 		else
 		{
 			//TODO:log? no.
-			/**allTheNodes->tqparent = htmlNode;
+			/**allTheNodes->parent = htmlNode;
 			lastHtmlChild->next = allTheNodes;
 			allTheNodes->prev = lastHtmlChild;
 			lastHtmlChild = allTheNodes;*/
diff --git a/quanta/parts/kafka/htmldocumentproperties.h b/quanta/parts/kafka/htmldocumentproperties.h
index bc0c9423..799e75db 100644
--- a/quanta/parts/kafka/htmldocumentproperties.h
+++ b/quanta/parts/kafka/htmldocumentproperties.h
@@ -51,7 +51,7 @@ public:
          * @param forceInsertionOfBasicNodes Force the insertion of the basic Nodes (HTML, BODY, HEAD, ...) if pressing OK
          * without having made any changes.
          */
-	htmlDocumentProperties( TQWidget* tqparent = 0, bool forceInsertionOfBasicNodes = false, 
+	htmlDocumentProperties( TQWidget* parent = 0, bool forceInsertionOfBasicNodes = false, 
           const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
 	~htmlDocumentProperties();
 	
diff --git a/quanta/parts/kafka/htmlenhancer.cpp b/quanta/parts/kafka/htmlenhancer.cpp
index daffd656..4a1d7c38 100644
--- a/quanta/parts/kafka/htmlenhancer.cpp
+++ b/quanta/parts/kafka/htmlenhancer.cpp
@@ -288,7 +288,7 @@ void HTMLEnhancer::postEnhanceNode(DOM::Node domNode)
 	if(domNode.isNull())
 		return;
 
-	//If domNode is a Block and there is no text around, and if domNode's tqparent can handle
+	//If domNode is a Block and there is no text around, and if domNode's parent can handle
 	//text or a P tag, add an empty text DOM::Node
 	// so that the user can access this area.
 	qTag = QuantaCommon::tagFromDTD(m_wkafkapart->getCurrentDoc()->defaultDTD(),
diff --git a/quanta/parts/kafka/htmlenhancer.h b/quanta/parts/kafka/htmlenhancer.h
index 065654a4..29ebe82f 100644
--- a/quanta/parts/kafka/htmlenhancer.h
+++ b/quanta/parts/kafka/htmlenhancer.h
@@ -47,7 +47,7 @@ public:
 	 * The DOM::Node must be built before calling this
 	 * function.
 	 * @param node The Node we want to enhance.
-	 * @param parentDNode the tqparent DOM::Node of the root DOM::Node of node.
+	 * @param parentDNode the parent DOM::Node of the root DOM::Node of node.
 	 * @param nextDNode the DOM::Node next to the root DOM::Node of node.
 	 */
 	virtual bool enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode);
diff --git a/quanta/parts/kafka/kafkacommon.cpp b/quanta/parts/kafka/kafkacommon.cpp
index 8ed413f4..9d0c7cdf 100644
--- a/quanta/parts/kafka/kafkacommon.cpp
+++ b/quanta/parts/kafka/kafkacommon.cpp
@@ -52,9 +52,9 @@ Node *kafkaCommon::getNextNode(Node *node, bool &goUp, Node *endNode)
         }
         else
         {
-            if(node->tqparent == endNode)
+            if(node->parent == endNode)
                 return 0L;
-            return getNextNode(node->tqparent, goUp);
+            return getNextNode(node->parent, goUp);
         }
     }
     else
@@ -74,9 +74,9 @@ Node *kafkaCommon::getNextNode(Node *node, bool &goUp, Node *endNode)
         else
         {
             goUp = true;
-            if(node->tqparent == endNode)
+            if(node->parent == endNode)
                 return 0L;
-            return getNextNode(node->tqparent, goUp);
+            return getNextNode(node->parent, goUp);
         }
     }
 }
@@ -119,7 +119,7 @@ Node* kafkaCommon::getPrevNode(Node *node, Node *endNode)
     }
     else
     {
-        n = n->tqparent;
+        n = n->parent;
         if(n == endNode)
             return 0L;
     }
@@ -171,13 +171,13 @@ Node* kafkaCommon::DTDGetCommonParent(Node* startNode, Node* endNode,
     if(commonParent && (commonParent->tag->type == Tag::Text || commonParent->tag->type == Tag::Empty))
     {
         Node* oldCommonParent = commonParent;
-        commonParent = commonParent->tqparent;
+        commonParent = commonParent->parent;
         commonParentStartChild = oldCommonParent;
         commonParentEndChild = oldCommonParent;
     }
     //startNode or endNode can't be the commonParent.
     else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end()))
-        commonParent = commonParent->tqparent;
+        commonParent = commonParent->parent;
 
     commonParentStartChildLocation = getLocation(commonParentStartChild);
     commonParentEndChildLocation = getLocation(commonParentEndChild);
@@ -222,18 +222,18 @@ Node* kafkaCommon::DTDGetNonInlineCommonParent(Node* startNode, Node* endNode,
        commonParent->tag->type == Tag::Text || commonParent->tag->type == Tag::Empty))
     {
         Node* oldCommonParent = commonParent;
-        commonParent = commonParent->tqparent;
+        commonParent = commonParent->parent;
         while(commonParent && isInline(commonParent->tag->name))
         {
             oldCommonParent = commonParent;
-            commonParent = commonParent->tqparent;
+            commonParent = commonParent->parent;
         }
         commonParentStartChild = oldCommonParent;
         commonParentEndChild = oldCommonParent;
     }
     //startNode or endNode can't be the commonParent.
     else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end()))
-        commonParent = commonParent->tqparent;
+        commonParent = commonParent->parent;
 
     commonParentStartChildLocation = getLocation(commonParentStartChild);
     commonParentEndChildLocation = getLocation(commonParentEndChild);
@@ -365,7 +365,7 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod
     kdDebug(25001)<< "kafkaCommon::applyIndentation()" << endl;
 #endif
 
-    Node *tqparent, *nextNE, *prevNE, *realPrevNE, *realNextNE, *realPrev, *realNext, *prev, *next;
+    Node *parent, *nextNE, *prevNE, *realPrevNE, *realNextNE, *realPrev, *realNext, *prev, *next;
     int nonInlineDepth = 0, nonInlineDepth2 = 0, i;
     bool b = false;
     TQString indentation1, indentation2, text;
@@ -383,10 +383,10 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod
     realNext = node->next;
 
     if(inlineNodeIndentation &&
-       !node->prev && getNodeDisplay(node->tqparent, true) == kafkaCommon::blockDisplay)
+       !node->prev && getNodeDisplay(node->parent, true) == kafkaCommon::blockDisplay)
     {
         AreaStruct node_area = node->tag->area();
-        AreaStruct parent_area = node->tqparent->tag->area();
+        AreaStruct parent_area = node->parent->tag->area();
 
         if(node_area.bLine == parent_area.bLine)
         {
@@ -400,30 +400,30 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod
         setTagString(node, removeUnnecessaryWhitespaces(node->tag->tagStr()), modifs);
 
     //compute the "non-inline depth" of the Node and of the next NE (not Empty) Node
-    // i.e. we count how many non-inline tqparent they have.
-    tqparent = node->tqparent;
-    while(tqparent)
+    // i.e. we count how many non-inline parent they have.
+    parent = node->parent;
+    while(parent)
     {
-        if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay)
+        if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay)
             ++nonInlineDepth;
-        tqparent = tqparent->tqparent;
+        parent = parent->parent;
     }
 
     //compute the "non-inline depth" of the next non-empty Node.
     if (nextNE)
-        tqparent = nextNE->tqparent;
+        parent = nextNE->parent;
     else
-        tqparent = 0L;
-    while(tqparent)
+        parent = 0L;
+    while(parent)
     {
-        if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay)
+        if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay)
             ++nonInlineDepth2;
-        tqparent = tqparent->tqparent;
+        parent = parent->parent;
     }
 
-    tqparent = node->tqparent;
+    parent = node->parent;
 
-    if(!tqparent || getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay)
+    if(!parent || getNodeDisplay(parent, true) == kafkaCommon::blockDisplay)
     {
         //prepare the indentation
         indentation1 = "\n";
@@ -507,7 +507,7 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod
     }
     else
     {
-        //The tqparent is inline, so no indentation.
+        //The parent is inline, so no indentation.
         //Nothing to do.
     }
     node->tag->setIndentationDone(true);
@@ -519,7 +519,7 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
     kdDebug(25001)<< "kafkaCommon::fitIndentationNodes()" << endl;
 #endif
 
-    Node *tqparent, *child, *node, *emptyNode = 0L, *emptyNode2 = 0L;
+    Node *parent, *child, *node, *emptyNode = 0L, *emptyNode2 = 0L;
     int nbEmptyNodes = 0, n1Depth, n2Depth;
     bool lastChild = false, firstChild = false;
 
@@ -534,16 +534,16 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
         if(n1Depth > n2Depth)
         {
             child = n1;
-            tqparent = n2;
+            parent = n2;
         }
         else
         {
             child = n2;
-            tqparent = n1;
+            parent = n1;
         }
-        if(child->tqparent->firstChildNE() == child)
+        if(child->parent->firstChildNE() == child)
             firstChild = true;
-        if(child->tqparent->lastChildNE() == child)
+        if(child->parent->lastChildNE() == child)
             lastChild = true;
 
         //counting the Empty Nodes and deleting them to have only one empty node.
@@ -591,11 +591,11 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
         //adding/deleting a empty node if necessary
         if(firstChild)
         {
-            if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay)
+            if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay)
             {
                 if(child->tag->type != Tag::Text && !emptyNode)
                 {
-                    createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->tqparent,
+                    createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->parent,
                                         child, child, modifs);
                 }
             }
@@ -610,11 +610,11 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
 
         if(lastChild)
         {
-            if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay)
+            if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay)
             {
                 if(child->tag->type != Tag::Text && !emptyNode2)
                 {
-                    createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->tqparent,
+                    createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->parent,
                                         0L, 0L, modifs);
                 }
             }
@@ -654,8 +654,8 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
         }
 
         //adding/deleting a empty node if necessary
-        tqparent = n1->tqparent;
-        if(!tqparent || getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay)
+        parent = n1->parent;
+        if(!parent || getNodeDisplay(parent, true) == kafkaCommon::blockDisplay)
         {
             if(getNodeDisplay(n1, true) == kafkaCommon::blockDisplay &&
                     n1->tag->type != Tag::Text)
@@ -672,7 +672,7 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
                     }
                     else
                     {
-                        createAndInsertNode("", "", Tag::Empty, n2->tag->write(), tqparent, n2, n2, modifs);
+                        createAndInsertNode("", "", Tag::Empty, n2->tag->write(), parent, n2, n2, modifs);
                     }
                 }
             }
@@ -694,7 +694,7 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs)
                     }
                     else
                     {
-                        createAndInsertNode("", "", Tag::Empty, n2->tag->write(), tqparent, n2, n2, modifs);
+                        createAndInsertNode("", "", Tag::Empty, n2->tag->write(), parent, n2, n2, modifs);
                     }
                 }
             }
@@ -1028,7 +1028,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling,
         nodeIsFirstChild = true;
         parentNode->child = node;
     }
-    node->tqparent = parentNode;
+    node->parent = parentNode;
 
     if(nextSibling && nextSibling->prev)
     {
@@ -1129,7 +1129,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, N
         nodeIsFirstChild = true;
         parentNode->child = node;
     }
-    node->tqparent = parentNode;
+    node->parent = parentNode;
 
     if(nextSibling && nextSibling->prev)
     {
@@ -1186,7 +1186,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, N
     return node;
 }
 
-Node *kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *nextSibling, Node *nextEndSibling,
+Node *kafkaCommon::insertNode(Node *newNode, Node *parent, Node *nextSibling, Node *nextEndSibling,
                               NodeModifsSet *modifs, bool merge)
 {
 #ifdef LIGHT_DEBUG
@@ -1199,7 +1199,7 @@ Node *kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *nextSibling,
         return 0L;
 
     //place the new Node.
-    newNode = insertNode(newNode, tqparent, nextSibling, modifs, merge);
+    newNode = insertNode(newNode, parent, nextSibling, modifs, merge);
 
     if(!newNode->tag->single && newNode->tag->type == Tag::XmlTag)
     {
@@ -1208,7 +1208,7 @@ Node *kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *nextSibling,
         nodeEnd->closesPrevious = true;
 
         //place the new closing Node.
-        nodeEnd = insertNode(nodeEnd, tqparent, nextEndSibling, modifs, merge);
+        nodeEnd = insertNode(nodeEnd, parent, nextEndSibling, modifs, merge);
     }
 
     //If nextSibling != nextEndSibling, move all Nodes between node and nodeEnd as child of node
@@ -1222,7 +1222,7 @@ Node *kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *nextSibling,
     return newNode;
 }
 
-Node* kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *startNodeToSurround,
+Node* kafkaCommon::insertNode(Node *newNode, Node *parent, Node *startNodeToSurround,
                               Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs)
 {
 #ifdef LIGHT_DEBUG
@@ -1246,7 +1246,7 @@ Node* kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *startNodeToSu
         endNodeToSurround = endNodeToSurround->next;
 
     //Then create and insert the new Node.
-    return insertNode(newNode, tqparent, startNodeToSurround,
+    return insertNode(newNode, parent, startNodeToSurround,
                       endNodeToSurround, modifs);
 }
 
@@ -1389,13 +1389,13 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti
     {
         *cursorNode = newNode;
         cursorOffset = newNode->tag->tagStr().length();
-        return insertNodeSubtree(newNode, startNode->tqparent, endNode, modifs);
+        return insertNodeSubtree(newNode, startNode->parent, endNode, modifs);
     }
 
     //Then we "split" the lastValidStartParent - startNode subtree into two : the first part is untouched
     // and the second will be surrounded by the new Node. Same thing for endNode.
     Node* node = startNode;
-    Node* parentNode = startNode->tqparent;
+    Node* parentNode = startNode->parent;
     Node* newParentNode = 0, *child = 0, *next = 0;
     while(parentNode && commonParent && parentNode != commonParent)
     {
@@ -1433,13 +1433,13 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti
         }
         //commonParentStartChild = parentNode;
         node = parentNode;
-        parentNode = parentNode->tqparent;
+        parentNode = parentNode->parent;
     }
 
     if(endNode)
     {
         node = endNode;
-        parentNode = endNode->tqparent;
+        parentNode = endNode->parent;
         while(parentNode && commonParent && parentNode != commonParent)
         {
             if(true/*node != parentNode->firstChild()*/)
@@ -1464,7 +1464,7 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti
             commonParentStartChild = newParentNode;
             node = parentNode;
             Node* aux = parentNode;
-            parentNode = parentNode->tqparent;
+            parentNode = parentNode->parent;
             // Remove node subtree if empty
             if(!aux->hasChildNodes())
                 extractAndDeleteNode(aux, modifs);
@@ -1527,8 +1527,8 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
       return false;
     }
 
-    //Then search for the common tqparent of startNode and endNode (commonParent)
-    //and for the childs of commonParent which are tqparent of startNode and endNode
+    //Then search for the common parent of startNode and endNode (commonParent)
+    //and for the childs of commonParent which are parent of startNode and endNode
     //(commonParentStartChild && commonParentEndChild)
     //CommonParent will be the limit (startNode -- commonNode) where Nodes can
     //be splitted in order to insert the newNode.
@@ -1559,25 +1559,25 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
                                             commonParent->tag->type == Tag::Text || commonParent->tag->type == Tag::Empty))
     {
         oldCommonParent = commonParent;
-        commonParent = commonParent->tqparent;
+        commonParent = commonParent->parent;
         while(commonParent && isInline(commonParent->tag->name))
         {
             oldCommonParent = commonParent;
-            commonParent = commonParent->tqparent;
+            commonParent = commonParent->parent;
         }
         commonParentStartChild = oldCommonParent;
         commonParentEndChild = oldCommonParent;
     }
     //startNode or endNode can't be the commonParent.
     else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end()))
-        commonParent = commonParent->tqparent;
+        commonParent = commonParent->parent;
 
-    //Now look if at least one of the tqparent Nodes between startNode and commonParent
+    //Now look if at least one of the parent Nodes between startNode and commonParent
     //can have nodeName as child. If so for startNode and endNode, let's find the last
-    //tqparent Nodes which can have nodeName as child.
-    parentNode = startNode->tqparent;
+    //parent Nodes which can have nodeName as child.
+    parentNode = startNode->parent;
     oldParentNode = startNode;
-    while(parentNode && commonParent && parentNode != commonParent->tqparent)
+    while(parentNode && commonParent && parentNode != commonParent->parent)
     {
         parentNodeTQTag = QuantaCommon::tagFromDTD(parentNode);
         if(parentNodeTQTag && parentNodeTQTag->isChild(newNode) &&
@@ -1588,11 +1588,11 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
         //else if(!newNodeIsInline && isInline(parentNode)), we continue : BLOCK element can
         //cut some inline tag in order to be inserted.
         oldParentNode = parentNode;
-        parentNode = parentNode->tqparent;
+        parentNode = parentNode->parent;
     }
-    parentNode = endNode->tqparent;
+    parentNode = endNode->parent;
     oldParentNode = endNode;
-    while(parentNode && commonParent &&  parentNode != commonParent->tqparent)
+    while(parentNode && commonParent &&  parentNode != commonParent->parent)
     {
         parentNodeTQTag = QuantaCommon::tagFromDTD(parentNode);
         if(parentNodeTQTag && parentNodeTQTag->isChild(newNode) &&
@@ -1603,7 +1603,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
         //else if(!newNodeIsInline && isInline(parentNode)), we continue : BLOCK element can
         //cut some inline tag in order to be inserted.
         oldParentNode = parentNode;
-        parentNode = parentNode->tqparent;
+        parentNode = parentNode->parent;
     }
 
     /**if(!lastValidEndParent || !lastValidStartParent)
@@ -1662,7 +1662,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
     node = startNode;
     if (!startNode) //Andras: it can happen.
       return false;
-    parentNode = startNode->tqparent;
+    parentNode = startNode->parent;
     while(lastValidStartParent && parentNode && parentNode != lastValidStartParent)
     {
         if(node != parentNode->firstChild())
@@ -1683,10 +1683,10 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
             }
         }
         node = parentNode;
-        parentNode = parentNode->tqparent;
+        parentNode = parentNode->parent;
     }
     node = endNode;
-    parentNode = endNode->tqparent;
+    parentNode = endNode->parent;
     while(lastValidEndParent && parentNode && parentNode != lastValidEndParent)
     {
         if(node != parentNode->lastChild())
@@ -1717,7 +1717,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
             }
         }
         node = parentNode;
-        parentNode = parentNode->tqparent;
+        parentNode = parentNode->parent;
     }
 
     //Now if startNode is after endNode, this means that a selectionless insertion is being done.
@@ -1732,7 +1732,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
         else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTag)
             parentNodeTQTag = QuantaCommon::tagFromDTD(startNode);
         else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTagEnd)
-            parentNodeTQTag = QuantaCommon::tagFromDTD(startNode->tqparent);
+            parentNodeTQTag = QuantaCommon::tagFromDTD(startNode->parent);
         if(!parentNodeTQTag || (parentNodeTQTag && parentNodeTQTag->isChild(newNode)))
         {
             if(isAfter)
@@ -1740,7 +1740,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset,
             else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTag)
                 insertNodeSubtree(newNode, startNode, 0L, modifs);
             else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTagEnd)
-                insertNodeSubtree(newNode, startNode->tqparent, startNode->next, modifs);
+                insertNodeSubtree(newNode, startNode->parent, startNode->next, modifs);
             //<TEMPORARY>
             (*cursorNode) = lastNewNode;
             cursorOffset = 0;
@@ -1798,7 +1798,7 @@ bool kafkaCommon::DTDinsertRemoveNode(Node *newNode, Node *startNode, int startO
 }
 
 Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString &tagString,
-                                       int nodeType, Document *doc, Node* tqparent, Node* nextSibling, NodeModifsSet *modifs,
+                                       int nodeType, Document *doc, Node* parent, Node* nextSibling, NodeModifsSet *modifs,
                                        bool merge)
 {
 #ifdef LIGHT_DEBUG
@@ -1812,13 +1812,13 @@ Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString
     node = createNode(nodeName, tagString, nodeType, doc);
 
     //insert the new Node.
-    insertNode(node, tqparent, nextSibling, modifs, merge);
+    insertNode(node, parent, nextSibling, modifs, merge);
 
     return node;
 }
 
 Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString &tagString,
-                                       int nodeType, Document *doc, Node *tqparent, Node *nextSibling, Node *nextEndSibling,
+                                       int nodeType, Document *doc, Node *parent, Node *nextSibling, Node *nextEndSibling,
                                        NodeModifsSet *modifs)
 {
 #ifdef LIGHT_DEBUG
@@ -1832,13 +1832,13 @@ Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString
     node = createNode(nodeName, tagString, nodeType, doc);
 
     //insert the new Node.
-    insertNode(node, tqparent, nextSibling, nextEndSibling, modifs);
+    insertNode(node, parent, nextSibling, nextEndSibling, modifs);
 
     return node;
 }
 
 Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString &tagString,
-                                       int nodeType, Document *doc, Node *tqparent, Node *startNodeToSurround,
+                                       int nodeType, Document *doc, Node *parent, Node *startNodeToSurround,
                                        Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs)
 {
 #ifdef LIGHT_DEBUG
@@ -1855,7 +1855,7 @@ Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString
     node = createNode(nodeName, tagString, nodeType, doc);
 
     //insert the new Node.
-    insertNode(node, tqparent, startNodeToSurround, endNodeToSurround, startOffset, endOffset,
+    insertNode(node, parent, startNodeToSurround, endNodeToSurround, startOffset, endOffset,
                modifs);
 
     return node;
@@ -1899,9 +1899,9 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode,
     if(!leafNodeTQTag)
         return false;
 
-    if(currentNode && currentNode->tqparent)
+    if(currentNode && currentNode->parent)
     {
-        currentNodeParentTQTag = QuantaCommon::tagFromDTD(currentNode->tqparent);
+        currentNodeParentTQTag = QuantaCommon::tagFromDTD(currentNode->parent);
         if(currentNodeParentTQTag && currentNodeParentTQTag->isChild(newNode))
             validCurNodeParent = true;
     }
@@ -2184,7 +2184,7 @@ Node *kafkaCommon::duplicateNodeSubtree(Node *node, bool childAndClosingTagOnly)
         newPrev = 0L;
         for(link = nodeLinkList.first(); link; link = nodeLinkList.next())
         {
-            if(link->m_n1 == currentNode->tqparent)
+            if(link->m_n1 == currentNode->parent)
                 newParent = link->m_n2;
             else if(link->m_n1 == currentNode->next)
                 newNext = link->m_n2;
@@ -2217,7 +2217,7 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh
 {
     NodeModif *modif = 0, *modifChild;
     Node *lastChild, *curNode;
-    Node *tqparent, *next, *child, *n;
+    Node *parent, *next, *child, *n;
     //Node *prev;
     bool isSingle;
     int type;
@@ -2231,7 +2231,7 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh
     if(!node->child)
         extractChildren = true;
 
-    tqparent = node->tqparent;
+    parent = node->parent;
     next = node->next;
     //prev = node->prev; //Should this be used at all?
     child = node->child;
@@ -2284,18 +2284,18 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh
         curNode = node->child;
         while(curNode)
         {
-            curNode->tqparent = node->tqparent;
+            curNode->parent = node->parent;
             curNode = curNode->next;
         }
     }
-    if(node->tqparent && node->tqparent->child == node)
+    if(node->parent && node->parent->child == node)
     {
         if(extractChildren)
-            node->tqparent->child = node->next;
+            node->parent->child = node->next;
         else
-            node->tqparent->child = node->child;
+            node->parent->child = node->child;
     }
-    node->tqparent = 0L;
+    node->parent = 0L;
     if(node->prev)
     {
         if(extractChildren)
@@ -2671,7 +2671,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
     if(startNode == endNode && startOffset == endOffset)
         return kafkaCommon::extractionBadParameters;
 
-    //Then, process startNode and endNode : look if a nodeName tqparent is one of
+    //Then, process startNode and endNode : look if a nodeName parent is one of
     //startNode/endNode's inline parents and if it is the case, split the necessary Nodes.
     //The comparaison is made in lowercase, even in xml : it could be strange, for an user, to have
     //its nodes not removed because there are in the wrong case.
@@ -2681,7 +2681,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
     {
         if(node->tag->name.lower() == nodeName.lower())
             lastNodeNameStartNode = node;
-        node = node->tqparent;
+        node = node->parent;
     }
     node = endNode;
     lastNodeNameEndNode = 0L;
@@ -2689,7 +2689,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
     {
         if(node->tag->name.lower() == nodeName.lower())
             lastNodeNameEndNode = node;
-        node = node->tqparent;
+        node = node->parent;
     }
 
     if(startNode->tag->type == Tag::Text)
@@ -2724,8 +2724,8 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
     if(lastNodeNameStartNode)
     {
         node = startNode;
-        parentNode = startNode->tqparent;
-        while(parentNode && parentNode != lastNodeNameStartNode->tqparent)
+        parentNode = startNode->parent;
+        while(parentNode && parentNode != lastNodeNameStartNode->parent)
         {
             if(node != parentNode->firstChild())
             {
@@ -2740,14 +2740,14 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
                 }
             }
             node = parentNode;
-            parentNode = parentNode->tqparent;
+            parentNode = parentNode->parent;
         }
     }
     if(lastNodeNameEndNode)
     {
         node = endNode;
-        parentNode = endNode->tqparent;
-        while(parentNode && parentNode != lastNodeNameEndNode->tqparent)
+        parentNode = endNode->parent;
+        while(parentNode && parentNode != lastNodeNameEndNode->parent)
         {
             if(node != parentNode->SLastChild())
             {
@@ -2770,7 +2770,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
                 }
             }
             node = parentNode;
-            parentNode = parentNode->tqparent;
+            parentNode = parentNode->parent;
         }
     }
 
@@ -2782,7 +2782,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s
         next = getNextNode(node, goUp);
         if(node->tag->type == Tag::XmlTag && node->tag->name.lower() == nodeName.lower())
         {
-            parentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
+            parentTQTag = QuantaCommon::tagFromDTD(node->parent);
             if(parentTQTag)
             {
                 child = node->firstChild();
@@ -2927,10 +2927,10 @@ bool kafkaCommon::splitNode(Node *n, int offset, NodeModifsSet *modifs)
 
     if(n->tag->type == Tag::Text)
         node = createAndInsertNode("#text", tagStr.right(tagStr.length() - offset), Tag::Text, n->tag->write(),
-                                   n->tqparent, n->next, modifs, false);
+                                   n->parent, n->next, modifs, false);
     else
         node = createAndInsertNode("", tagStr.right(tagStr.length() - offset), Tag::Empty, n->tag->write(),
-                                   n->tqparent, n->next, modifs, false);
+                                   n->parent, n->next, modifs, false);
 
     //Node's string is a part of n's clean string
     node->tag->setCleanStrBuilt(true);
@@ -2944,7 +2944,7 @@ void kafkaCommon::splitStartNodeSubtree(Node* startNode, Node* commonParent,
     //Then we "split" the lastValidStartParent - startNode subtree into two : the first part is untouched
     // and the second will be surrounded by the new Node. Same thing for endNode.
     Node* node = startNode;
-    Node* parentNode = startNode->tqparent;
+    Node* parentNode = startNode->parent;
     Node* commonParentStartChild = 0;
     while(parentNode && commonParent && parentNode != commonParent)
     {
@@ -2962,7 +2962,7 @@ void kafkaCommon::splitStartNodeSubtree(Node* startNode, Node* commonParent,
         }
         commonParentStartChild = parentNode;
         node = parentNode;
-        parentNode = parentNode->tqparent;
+        parentNode = parentNode->parent;
     }
 
     if(commonParentStartChild)
@@ -2975,7 +2975,7 @@ void kafkaCommon::splitEndNodeSubtree(Node* endNode, Node* commonParent,
                                       bool subTree, NodeModifsSet* modifs)
 {
     Node* node = endNode;
-    Node* parentNode = endNode->tqparent;
+    Node* parentNode = endNode->parent;
 
     Node* aux = 0;
     if(subTree)
@@ -3009,7 +3009,7 @@ void kafkaCommon::splitEndNodeSubtree(Node* endNode, Node* commonParent,
             }
         }
         node = parentNode;
-        parentNode = parentNode->tqparent;
+        parentNode = parentNode->parent;
     }
     commonParentStartChildLocation = getLocation(commonParentStartChild);
     commonParentEndChildLocation = getLocation(commonParentEndChild);
@@ -3029,11 +3029,11 @@ void kafkaCommon::splitStartAndEndNodeSubtree(Node*& startNode, int startOffset,
     startNode = getCorrectStartNode(startNode, startOffset);
     endNode = getCorrectEndNode(endNode, endOffset);
 
-    // look for common tqparent
+    // look for common parent
     if(!commonParent)
     {
         if(extractInlineParentNodes)
-            // get the non inline common tqparent
+            // get the non inline common parent
             commonParent =
                     DTDGetNonInlineCommonParent(startNode, endNode, commonParentStartChildLocation, commonParentEndChildLocation, subTree);
         else
@@ -3075,7 +3075,7 @@ void kafkaCommon::splitStartAndEndNodeSubtree(Node*& startNode, int startOffset,
     }
     splitNode(endNode, endOffset, modifs);
 
-    // split start and end nodes subtree in function of common tqparent
+    // split start and end nodes subtree in function of common parent
     commonParentStartChildLocation = kafkaCommon::getLocation(commonParentStartChild);
     splitStartNodeSubtree(startNode, commonParent, commonParentStartChildLocation, modifs);
 
@@ -3208,21 +3208,21 @@ bool kafkaCommon::mergeNodes(Node *n, Node *n2, NodeSelection& cursorHolder, Nod
 void kafkaCommon::mergeInlineNode(Node *startNode, Node *endNode, Node **cursorNode,
                                   long &cursorOffset, NodeModifsSet *modifs)
 {
-    Node *startNodeLastInlineParent, *tqparent, *node, *next;
+    Node *startNodeLastInlineParent, *parent, *node, *next;
     bool goUp, success, isCursorNode, isEndNode;
     int nodeLength;
 
     if(!startNode || !endNode)
         return;
 
-    //first search for the last inline tqparent of startNode, and then its last prev neighbour
+    //first search for the last inline parent of startNode, and then its last prev neighbour
     // which is also inline : the merge will start from this Node.
     startNodeLastInlineParent = startNode;
-    tqparent = startNode->tqparent;
-    while(tqparent && isInline(tqparent->tag->name))
+    parent = startNode->parent;
+    while(parent && isInline(parent->tag->name))
     {
-        startNodeLastInlineParent = tqparent;
-        tqparent = tqparent->tqparent;
+        startNodeLastInlineParent = parent;
+        parent = parent->parent;
     }
     if(startNodeLastInlineParent->prev)
     {
@@ -3420,7 +3420,7 @@ TQValueList<int> kafkaCommon::getLocation(Node * node)
             node = node->prev;
         }
         loc.prepend(i);
-        node = node->tqparent;
+        node = node->parent;
     }
     return loc;
 }
@@ -3634,11 +3634,11 @@ int kafkaCommon::nodeDepth(Node *node)
     if(!node)
         return -1;
 
-    node = node->tqparent;
+    node = node->parent;
     while(node)
     {
         depth++;
-        node = node->tqparent;
+        node = node->parent;
     }
 
     return depth;
@@ -3646,12 +3646,12 @@ int kafkaCommon::nodeDepth(Node *node)
 
 Node* kafkaCommon::hasParent(Node *node, const TQString &name)
 {
-    node = node->tqparent;
+    node = node->parent;
     while(node)
     {
         if(node->tag->name.lower() == name.lower())
             return node;
-        node = node->tqparent;
+        node = node->parent;
     }
 
     return 0L;
@@ -3673,31 +3673,31 @@ Node* kafkaCommon::hasParent(Node* startNode, Node* endNode, const TQString &nam
     {
         if(node->tag->name.lower() == name.lower())
             return node;
-        node = node->tqparent;
+        node = node->parent;
     }
 
     return 0;
 }
 
-bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node tqparent, DOM::Node nextSibling,
+bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node parent, DOM::Node nextSibling,
                                 DOM::Node rootNode)
 {
     if(node.isNull())
         return false;
 
-    if(tqparent.isNull())
+    if(parent.isNull())
     {
         if(rootNode.isNull())
             return false;
-        tqparent = rootNode;
+        parent = rootNode;
     }
     //Andras: avoid exceptions
-    if (!nextSibling.isNull() && nextSibling.parentNode() != tqparent)
+    if (!nextSibling.isNull() && nextSibling.parentNode() != parent)
     {
       kdDebug(25001)<< "kafkaCommon::insertDomNode() - invalid nextSibling!" << endl;
       return false;
     }
-    if (node.ownerDocument() != tqparent.ownerDocument())
+    if (node.ownerDocument() != parent.ownerDocument())
     {
       kdDebug(25001)<< "kafkaCommon::insertDomNode() - ownerDocument is different!" << endl;
       return false;
@@ -3705,7 +3705,7 @@ bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node tqparent, DOM::Node ne
 
     try
     {
-        tqparent.insertBefore(node, nextSibling);
+        parent.insertBefore(node, nextSibling);
     }
     catch(DOM::DOMException e)
     {
@@ -3716,12 +3716,12 @@ bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node tqparent, DOM::Node ne
 
 bool kafkaCommon::removeDomNode(DOM::Node node)
 {
-    DOM::Node tqparent = node.parentNode();
+    DOM::Node parent = node.parentNode();
 
-    if(tqparent.isNull())
+    if(parent.isNull())
         return false;
 
-    tqparent.removeChild(node);
+    parent.removeChild(node);
 
     return true;
 }
@@ -3908,16 +3908,16 @@ bool kafkaCommon::isInline(DOM::Node domNode)
     return isInline(domNode.nodeName().string());
 }
 
-bool kafkaCommon::parentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode,
+bool kafkaCommon::parentSupports(DOM::Node parent, DOM::Node startNode, DOM::Node endNode,
                                  const DTDStruct* dtd)
 {
     TQTag *parentTQTag;
     DOM::Node child;
 
-    if(!dtd || tqparent.isNull())
+    if(!dtd || parent.isNull())
         return false;
 
-    parentTQTag = QuantaCommon::tagFromDTD(dtd, tqparent.nodeName().string());
+    parentTQTag = QuantaCommon::tagFromDTD(dtd, parent.nodeName().string());
 
     if(!parentTQTag)
         return false;
@@ -3984,7 +3984,7 @@ void kafkaCommon::coutDomTree(DOM::Node, int)
         kdDebug(25001) << output <<" (" << node.nodeType() << ") "<<
         node.handle() <<  endl;
         kdDebug(25001)<< dots << "  +++ prev " << node.previousSibling().handle() << " next " <<
-        node.nextSibling().handle() << " tqparent " <<
+        node.nextSibling().handle() << " parent " <<
         node.parentNode().handle() << " child " << node.firstChild().handle() << endl;
         for(j = 0; j < (int)node.attributes().length(); ++j)
         {
@@ -4026,8 +4026,8 @@ void kafkaCommon::coutTree(Node *node, int indent)
         kdDebug(25001) << output <<" (" << node->tag->type << ", " << node->tag->cleanStrBuilt() << ", " <<
         node->tag->indentationDone() << ") "<< node << " at pos " << bLine << ":" << bCol << " - " <<
         eLine << ":" << eCol << endl;
-        kdDebug(25001)<< dots << "  +++ prev " << node->prev << " next " << node->next << " tqparent " <<
-        node->tqparent << " child " << node->child << endl;
+        kdDebug(25001)<< dots << "  +++ prev " << node->prev << " next " << node->next << " parent " <<
+        node->parent << " child " << node->child << endl;
         for(j = 0; j < node->tag->attrCount(); ++j)
         {
             kdDebug(25001)<< dots << " *** attr" << j << " " <<
@@ -4069,13 +4069,13 @@ int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, TQString const& t
 
     tag_start = hasParent(start_node, tag_name);
     if(tag_start)
-        return 0; // only start_node has tag_name as tqparent
+        return 0; // only start_node has tag_name as parent
 
     tag_start = hasParent(end_node, tag_name);
     if(tag_start)
-        return 0; // only end_node has tag_name as tqparent
+        return 0; // only end_node has tag_name as parent
 
-    return -1; // neither the nodes have tag_name as tqparent
+    return -1; // neither the nodes have tag_name as parent
 }
 
 int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, TQString const& tag_name,
@@ -4092,13 +4092,13 @@ int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, TQString const& t
 
     tag_start = hasParent(start_node, tag_name);
     if(tag_start && tag_start->tag->hasAttribute(attribute_name) && tag_start->tag->attributeValue(attribute_name, true) == attribute_value)
-        return 0; // only start_node has tag_name as tqparent
+        return 0; // only start_node has tag_name as parent
 
     tag_start = hasParent(end_node, tag_name);
     if(tag_start && tag_start->tag->hasAttribute(attribute_name) && tag_start->tag->attributeValue(attribute_name, true) == attribute_value)
-        return 0; // only end_node has tag_name as tqparent
+        return 0; // only end_node has tag_name as parent
 
-    return -1; // neither the nodes have tag_name as tqparent
+    return -1; // neither the nodes have tag_name as parent
 }
 
 bool kafkaCommon::isBetweenWords(Node* node, int offset)
diff --git a/quanta/parts/kafka/kafkacommon.h b/quanta/parts/kafka/kafkacommon.h
index fdec2aef..c3d76488 100644
--- a/quanta/parts/kafka/kafkacommon.h
+++ b/quanta/parts/kafka/kafkacommon.h
@@ -58,7 +58,7 @@ public:
 	/**
 	 * This function returns the next Node after node : the first child of
 	 * node if available, else its next sibling if available, else the next
-	 * available next sibling of a tqparent of node.
+	 * available next sibling of a parent of node.
 	 * @param _node It is the Node from which we want the next Node.
 	 * @param goUp This boolean specifies if we should go up (torwards the root Node)
 	 * i.e. not looking at the childs of node, or make a standart iteration.
@@ -87,20 +87,20 @@ public:
 
     
     /**
-     * Returns the first common tqparent to startNode and endNode that isn't inline.
+     * Returns the first common parent to startNode and endNode that isn't inline.
      * @param startNode Start node.
      * @param endNode End node.
-     * @param commonParentStartChildLocation  Is the child of commonParent which is tqparent of startNode
-     * @param commonParentEndChildLocation Is the child of commonParent which is tqparent of endNode
+     * @param commonParentStartChildLocation  Is the child of commonParent which is parent of startNode
+     * @param commonParentEndChildLocation Is the child of commonParent which is parent of endNode
      * @param nodeSubtree When startNode and endNode doesn't belong to the current document tree. Pass 0 if they do.
-     * @return The first, non inline, common tqparent of startNode and endNode.
+     * @return The first, non inline, common parent of startNode and endNode.
      */
     static Node* DTDGetNonInlineCommonParent(Node* startNode, Node* endNode, 
                                              TQValueList<int>& commonParentStartChildLocation, 
                                              TQValueList<int>& commonParentEndChildLocation, Node* nodeSubtree);
 
     /**
-     * Same as above, only that the common tqparent can be inline.
+     * Same as above, only that the common parent can be inline.
      */
     static Node* DTDGetCommonParent(Node* startNode, Node* endNode, 
                                     TQValueList<int>& commonParentStartChildLocation, 
@@ -109,14 +109,14 @@ public:
 	/**
 	 * This function returns the next DOM::Node after node : the first child of
 	 * DOM::Node if available, else its next sibling if available, else the next
-	 * available next sibling of a tqparent of node.
+	 * available next sibling of a parent of node.
 	 * @param node The DOM::Node the search starts from.
 	 * @param goUp This boolean specifies if we should go up or down in the tree.
 	 * For a normal use, It must be set to false at the
 	 * beginning and then the same boolean must be used when using
 	 * several times this function.
 	 * @param returnParentNode Specifies if there are no child and next sibling, if
-	 * we should return the tqparent.
+	 * we should return the parent.
 	 * @param endNode Specifies at which DOM::Node the search should end. It is useful
 	 * when setting returnParentNode to false.
 	 * @return the next Node.
@@ -153,7 +153,7 @@ public:
      static Node* getCorrectEndNode(Node* endNode, int& endOffset);
      
      /**
-      * Get the first child of commonParent which is tqparent of node
+      * Get the first child of commonParent which is parent of node
       * @param node 
       * @param commonParent 
       * @return 
@@ -186,7 +186,7 @@ public:
 	 * generated by the undoRedo system. The undoRedo system can't create itself these Nodes
 	 * because it will create them only during the synchronization, making all the TQValueList<int>
 	 * Nodes location wrong.
-	 * WARNING n1 and n2 must be siblings or tqparent-child. If there are sibling and n1 is a XmlTag,
+	 * WARNING n1 and n2 must be siblings or parent-child. If there are sibling and n1 is a XmlTag,
 	 * n1 should not have non empty childs.
 	 * @param n1 The start node.
 	 * @param n2 The end node.
@@ -290,7 +290,7 @@ public:
 	 * WARNING : baseNode is used as the rootNode.
 	 * It will also try to merge text/Empty Nodes.
 	 * @param node The node to insert.
-	 * @param parentNode This Node will be the tqparent of node.
+	 * @param parentNode This Node will be the parent of node.
 	 * @param nextSibling This Node will be the next Sibling of Node. If null, node will be appended at
 	 * the child list of parentNode.
 	 * TODO: @param rootNode The rootNode of the tree we want to insert the Node (usually &baseNode).
@@ -308,11 +308,11 @@ public:
 	/**
 	 * It behaves essentially like the above function except that it can "surround" a set of Nodes with the
 	 * new Node. Thus, the closing Node is created if necessary.
-	 * nextSibling and nextEndSibling MUST have the same tqparent. If not, use the
+	 * nextSibling and nextEndSibling MUST have the same parent. If not, use the
 	 * DTDinsertNode.
 	 * This function does not try to know if the location of the new Node is DTD valid.
 	 * @param newNode The new Node to insert.
-	 * @param tqparent The tqparent of the Node.
+	 * @param parent The parent of the Node.
 	 * @param nextSibling The next sibling of the Node.
 	 * @param nextEndSibling The next sibling of the closing Node if created. If nextEndSibling ==
 	 * nextSibling, the closing Node will be placed at the right of the newly created Node.
@@ -320,13 +320,13 @@ public:
 	 * @param modifs The changes made are logged into modifs.
 	 * @return Returns a pointer to the node inserted.
 	 */
-	static Node *insertNode(Node *newNode, Node *tqparent, Node *nextSibling, Node *nextEndSibling,
+	static Node *insertNode(Node *newNode, Node *parent, Node *nextSibling, Node *nextEndSibling,
 		NodeModifsSet *modifs, bool merge = true);
 
 	/**
 	 * It behaves essentially like the above function except that it can split the endNodeToSurround and
 	 * startNodeToSurround if necessary, according to the offsets.
-	 * startNodeToSurround et endNodeToSurround MUST have the same tqparent. If not, use the last
+	 * startNodeToSurround et endNodeToSurround MUST have the same parent. If not, use the last
 	 * DTDinsertNode.
 	 * This function does not try to know if the location of the new Node is valid.
 	 * @param startNodeToSurround The first Node which will be enclosed by the new Node.
@@ -334,7 +334,7 @@ public:
 	 * @param startOffset The first Node will be splitted at offset startOffset, the right part will be enclosed.
 	 * @param endOffset The last Node will be splitted at offset endOffset, the left part will be enclosed.
 	 */
-	static Node* insertNode(Node *newNode, Node *tqparent, Node *startNodeToSurround,
+	static Node* insertNode(Node *newNode, Node *parent, Node *startNodeToSurround,
 		Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs);
 
 	/**
@@ -353,7 +353,7 @@ public:
 	 * @param cursorNode The cursor is inside cursorNode.
 	 * @param cursorOffset The offset of the cursor inside cursorNode.
 	 * </TEMPORARY>
-	 * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid tqparent.
+	 * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid parent.
 	 */
 	static bool DTDinsertNode(Node *newNode, Node *startNode, int startOffset, Node *endNode,
 		int endOffset, Document *doc, Node **cursorNode, long &cursorOffset, NodeModifsSet *modifs);
@@ -373,7 +373,7 @@ public:
 	 * WARNING : baseNode is used as the rootNode.
 	 * It will also try to merge text/Empty Nodes.
 	 * @param node The root node of the Node subtree to insert.
-	 * @param parentNode This Node will be the tqparent of node.
+	 * @param parentNode This Node will be the parent of node.
 	 * @param nextSibling This Node will be the next Sibling of Node. If null, node will be appended at
 	 * the child list of parentNode.
 	 * @param modifs The changes made are logged into modifs. Put 0L if you don't want to log
@@ -387,12 +387,12 @@ public:
 	/**
 	 * It behaves essentially like the above function except that it can "surround" a set of Nodes with the
 	 * new Node. Thus, the closing Node is created if necessary.
-	 * nextSibling and nextEndSibling MUST have the same tqparent. If not, use the
+	 * nextSibling and nextEndSibling MUST have the same parent. If not, use the
 	 * DTDinsertNode.
-	 * The Node Subtree MUST be a single-Node-per-tqparent subtree.
+	 * The Node Subtree MUST be a single-Node-per-parent subtree.
 	 * This function does not try to know if the location of the new Node is DTD valid.
 	 * @param node The root node of the Node subtree to insert.
-	 * @param tqparent The tqparent of the Node.
+	 * @param parent The parent of the Node.
 	 * @param nextSibling The next sibling of the Node.
 	 * @param nextEndSibling The next sibling of the closing Node if created. If nextEndSibling ==
 	 * nextSibling, the closing Node will be placed at the right of the newly created Node.
@@ -425,17 +425,17 @@ public:
 	 * @param tagString The string of the tag.
 	 * @param nodeType The type of the Node cf Tag::TokenType.
 	 * @param doc The Node belongs to this Document.
-	 * @param tqparent The tqparent of the Node.
+	 * @param parent The parent of the Node.
 	 * @param nextSibling The next sibling of the Node.
 	 * @return Returns a pointer to the newly created Node.
 	 */
 	static Node *createAndInsertNode(const TQString &nodeName, const TQString &tagString, int nodeType,
-		Document *doc, Node* tqparent, Node* nextSibling, NodeModifsSet *modifs, bool merge = true);
+		Document *doc, Node* parent, Node* nextSibling, NodeModifsSet *modifs, bool merge = true);
 
 	/**
 	 * It behaves essentially like the above function except that it reate its closing Node if necessary
-	 *  and then insert them with tqparent as Node's tqparent.
-	 * nextSibling and nextEndSibling MUST have the same tqparent. If not, use the
+	 *  and then insert them with parent as Node's parent.
+	 * nextSibling and nextEndSibling MUST have the same parent. If not, use the
 	 * DTDcreateAndInsertNode.
 	 * @param nextEndSibling The next sibling of the closing Node if created. If nextEndSibling ==
 	 * nextSibling, the closing Node will be placed at the right of the newly created Node.
@@ -443,11 +443,11 @@ public:
 	 * @param modifs The changes made are logged into modifs.
 	 */
 	static Node *createAndInsertNode(const TQString &nodeName, const TQString &tagString, int nodeType,
-		Document *doc, Node *tqparent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs);
+		Document *doc, Node *parent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs);
 
 	/**
 	 * It behaves essentially like the above function except that if necessary, it will split the Nodes.
-	 * startNodeToSurround et endNodeToSurround MUST have the same tqparent. If not, use the
+	 * startNodeToSurround et endNodeToSurround MUST have the same parent. If not, use the
 	 * DTDcreateAndInsertNode.
 	 * This function does not try to know if the location of the new Node is valid.
 	 * @param startNodeToSurround The first Node which will be enclosed by the new Node.
@@ -456,7 +456,7 @@ public:
 	 * @param endOffset The last Node will be splitted at offset endOffset, the left part will be enclosed.
 	 */
 	static Node *createAndInsertNode(const TQString &nodeName, const TQString &tagString,
-		int nodeType, Document *doc, Node *tqparent, Node *startNodeToSurround,
+		int nodeType, Document *doc, Node *parent, Node *startNodeToSurround,
 		Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs);
 
 	/**
@@ -470,7 +470,7 @@ public:
 	 * @param startOffset If firstNode is a text, specify at which offset the new Node must begin to surround.
 	 * @param endNode The last Node which must be surrounded by the new Node.
 	 * @param endOffset If endNode is a text, specify at which offset the new Node must stop to surround.
-	 * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid tqparent.
+	 * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid parent.
 	 */
 	static bool DTDcreateAndInsertNode(const TQString &nodeName, const TQString &tagString, int nodeType,
 		Document *doc, Node *startNode, int startOffset, Node *endNode, int endOffset,
@@ -523,7 +523,7 @@ public:
 	 * @param node The node to delete.
 	 * @param modifs The changes made are logged into modifs.
 	 * @param extractChilds If we extract or move up the tqchildren. WARNING: it don't check
-	 * if the tqchildren of node are legal childs of the tqparent of node.
+	 * if the tqchildren of node are legal childs of the parent of node.
 	 * @param removeClosingTag Extract the closingTag if node isn't single and is Tag::XmlTag.
 	 * TODO: @param removeEmbeddedTags Specifies if we delete the embedded Nodes e.g.
 	 * <a href="<? boo ?>" > : the PHP block is an embedded block.
@@ -593,7 +593,7 @@ public:
 		//The node to extract was not found.
 		nothingExtracted = 0,
 		//The extract operation stopped because of a DTD error : if the node was removed, the child
-		//weren't able to be childs of the node's tqparent, according to the DTD. Should not occur
+		//weren't able to be childs of the node's parent, according to the DTD. Should not occur
 		//except really bad HTML.
 		extractionStoppedDueToBadNodes,
 		//everything has gone fine
@@ -628,7 +628,7 @@ public:
 	/**
 	 * Moves a Node somewhere else.
 	 * @param nodeToMove The node to move :-)
-	 * @param newParent The new tqparent of nodeToMove.
+	 * @param newParent The new parent of nodeToMove.
      * @param newNextSibling The new next Sibling of nodeToMove. If null, node will be appended at
      * the child list of parentNode.
 	 * @param modifs The changes made are logged into modifs.
@@ -695,10 +695,10 @@ public:
      * @param startOffset
      * @param endNode The node where a selection ends, for example.
      * @param endOffset
-     * @param commonParent This is the common tqparent between start and end node. 
+     * @param commonParent This is the common parent between start and end node. 
      * If 0, it tries to find the commonParent, else it uses the passed node.
-     * @param commonParentStartChildLocation The first child of commonParent which is tqparent of startNode is stored here.
-     * @param commonParentEndChildLocation The first child of commonParent which is tqparent of endNode is stored here.
+     * @param commonParentStartChildLocation The first child of commonParent which is parent of startNode is stored here.
+     * @param commonParentEndChildLocation The first child of commonParent which is parent of endNode is stored here.
      * @param cursorNode The cursor node is stored here.
      * @param cursorOffset The cursor offset is stored here.
      * @param subTree The node corresponding to the start of a subtree that doesn't belong to the current document, or 0.
@@ -809,8 +809,8 @@ public:
 	/**
 	 * Get the node corresponding to a sublocation.
 	 * @param loc A location of a Node.
-	 * @locOffset We want the (totalNumberOfParent - locOffset)th tqparent of Node.
-	 * @return Returns a tqparent of the node pointed by loc.
+	 * @locOffset We want the (totalNumberOfParent - locOffset)th parent of Node.
+	 * @return Returns a parent of the node pointed by loc.
 	 */
 	static Node* getNodeFromSubLocation(TQValueList<int> loc, int locOffset);
 
@@ -856,18 +856,18 @@ public:
 	 * Get the node's depth in the tree.
 	 * @param node The node we want the depth.
 	 * @return Returns the depth of node. It is basically the number of parents of node.
-	 * It will return 0 if node has no tqparent Nodes, and -1 if node doesn't exists.
+	 * It will return 0 if node has no parent Nodes, and -1 if node doesn't exists.
 	 */
 	static int nodeDepth(Node *node);
 
 	/**
-	 * Looks if node has a tqparent which is named name.
-	 * @return Returns the first tqparent which is named name or 0L if not found.
+	 * Looks if node has a parent which is named name.
+	 * @return Returns the first parent which is named name or 0L if not found.
 	 */
 	static Node* hasParent(Node *node, const TQString &name);
 
     /**
-     * Tries to find the common tqparent to startNode and endNode, in the same conditions as above.
+     * Tries to find the common parent to startNode and endNode, in the same conditions as above.
      */
     static Node* hasParent(Node* startNode, Node* endNode, const TQString &name);
 
@@ -879,12 +879,12 @@ public:
 	 * WARNING : The postEnhancement is not done (cf htmlenhancer.h)
 	 * Prefer using KafkaDocument::insertDomNode()
 	 * @param node The node to insert.
-	 * @param tqparent The new tqparent of node. If null, insert node at the top level.
+	 * @param parent The new parent of node. If null, insert node at the top level.
 	 * @param nextSibling The new next sibling of node. If null, append node at the end of the child list.
-	 * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no tqparent is provided.
+	 * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no parent is provided.
 	 * @return Returns true if the operation was successfull.
 	 */
-	static bool insertDomNode(DOM::Node node, DOM::Node tqparent = DOM::Node(),
+	static bool insertDomNode(DOM::Node node, DOM::Node parent = DOM::Node(),
 		DOM::Node nextSibling = DOM::Node(), DOM::Node rootNode = DOM::Node());
 
 
@@ -978,21 +978,21 @@ public:
 		const TQString &attrName, const TQString &attrValue, DOM::Document rootNode);
 	
     /**
-	 * Looks if domNode has a tqparent which is named name.
-	 * @return Returns the first tqparent which is named name or an empty DOM::Node if not found.
+	 * Looks if domNode has a parent which is named name.
+	 * @return Returns the first parent which is named name or an empty DOM::Node if not found.
 	 */
 	static DOM::Node hasParent(DOM::Node domNode, const TQString &name);
 
 	/**
 	 * Returns the position of the child domNode.
 	 * @param domNode This is the DOM::Node we want the position.
-	 * @return Returns the position of domNode inside domNode's tqparent's tqchildren or -1 if not found.
+	 * @return Returns the position of domNode inside domNode's parent's tqchildren or -1 if not found.
 	 */
 	static int childPosition(DOM::Node domNode);
 
 	/**
 	 * Returns the position'th child of parentNode.
-	 * @param parentNode The tqparent Node of the node to return.
+	 * @param parentNode The parent Node of the node to return.
 	 * @param position We return the position'th child Node.
 	 * @param fallback If set to true, it will always return a valid Node (except if there is no child!!)
 	 */
@@ -1005,10 +1005,10 @@ public:
 	static bool isInline(DOM::Node domNode);
 
 	/**
-	 * Specify if tqparent supports the siblings DOM::Nodes starting from startNode to endNode
+	 * Specify if parent supports the siblings DOM::Nodes starting from startNode to endNode
 	 * according to the DTD dtd.
 	 */
-	static bool parentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode,
+	static bool parentSupports(DOM::Node parent, DOM::Node startNode, DOM::Node endNode,
 		const DTDStruct* dtd);
     
 
@@ -1030,7 +1030,7 @@ public:
 	/**
 	 * Prints in stdout the current Node tree.
 	 * @param node The startNode
-	 * @param indent The number of little dots per tqparent relationship.
+	 * @param indent The number of little dots per parent relationship.
 	 */
 	static void coutTree(Node *node, int indent);
  
@@ -1085,7 +1085,7 @@ public:
     
 private:
     /**
-     * Split the last valid start tqparent (commonParentStartChild) into two.
+     * Split the last valid start parent (commonParentStartChild) into two.
      * This and the method above are related and are used in sequence.
      * The following tree:
      *  <body>
@@ -1120,14 +1120,14 @@ private:
      *      </b>
      *  </body>
      * @param startNode The node where a selection starts, for example.
-     * @param commonParent This is the common tqparent between start and end node.
-     * @param commonParentStartChildLocation The first child of commonParent which is tqparent of startNode
+     * @param commonParent This is the common parent between start and end node.
+     * @param commonParentStartChildLocation The first child of commonParent which is parent of startNode
      * @param modifs The changes made are logged into modifs.
      */
     static void splitStartNodeSubtree(Node* startNode, Node* commonParent, 
                                       TQValueList<int>& commonParentStartChildLocation, NodeModifsSet* modifs);
     /**
-     * Split the last valid start tqparent (commonParentStartChild) into two.
+     * Split the last valid start parent (commonParentStartChild) into two.
      * The following tree:
      *  <body>
      *      <b>                     --> commonParent
@@ -1162,9 +1162,9 @@ private:
      *      </b>
      *  </body>
      * @param endNode The node where a selection ends, for example.
-     * @param commonParent This is the common tqparent between start and end node.
-     * @param commonParentStartChildLocation The first child of commonParent which is tqparent of startNode.
-     * @param commonParentEndChildLocation The first child of commonParent which is tqparent of endNode.
+     * @param commonParent This is the common parent between start and end node.
+     * @param commonParentStartChildLocation The first child of commonParent which is parent of startNode.
+     * @param commonParentEndChildLocation The first child of commonParent which is parent of endNode.
      * @param subTree True if we are dealing with a tree that doesn't belong to the current document.
      * @param modifs The changes made are logged into modifs.
      */
diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp
index ed31f049..20a583e8 100644
--- a/quanta/parts/kafka/kafkahtmlpart.cpp
+++ b/quanta/parts/kafka/kafkahtmlpart.cpp
@@ -83,9 +83,9 @@ public:
 #endif
 };
 
-KafkaWidget::KafkaWidget(TQWidget *tqparent, TQWidget *widgetParent, KafkaDocument *part,
+KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part,
                          const char *name)
-        : KHTMLPart(widgetParent, name, TQT_TQOBJECT(tqparent), name),
+        : KHTMLPart(widgetParent, name, TQT_TQOBJECT(parent), name),
         w(part)
 {
     m_contextPopupMenu = new TQPopupMenu();
@@ -205,10 +205,10 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position)
     else if(position == 0)
     {
         DOM::Text textNode = document().createTextNode(text);
-        DOM::Node tqparent = node.parentNode();
-//FIXME: Andras: safety checks, as tqparent  can be null. Maybe it just hides the error...
-        if (!tqparent.isNull())
-          tqparent.insertBefore(textNode, node);
+        DOM::Node parent = node.parentNode();
+//FIXME: Andras: safety checks, as parent  can be null. Maybe it just hides the error...
+        if (!parent.isNull())
+          parent.insertBefore(textNode, node);
         else
           node.appendChild(textNode);
         m_currentNode = textNode;
@@ -223,15 +223,15 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position)
     else if(position == 3 || (position == 1 && (focus == kNodeAttrs::singleNodeAndItself)))
     {
         DOM::Text textNode = document().createTextNode(text);
-        DOM::Node tqparent = node.parentNode();
-//FIXME: Andras: safety checks, as tqparent and node.nextSibling can be null. Maybe it just hides the error...
+        DOM::Node parent = node.parentNode();
+//FIXME: Andras: safety checks, as parent and node.nextSibling can be null. Maybe it just hides the error...
 //Also it seems that position can be 3 and node is "body". See bug 112733.
-        if (node.nodeName().string().lower() != "body" && !tqparent.isNull())
+        if (node.nodeName().string().lower() != "body" && !parent.isNull())
         {
           if (!node.nextSibling().isNull())
-            tqparent.insertBefore(textNode, node.nextSibling());
+            parent.insertBefore(textNode, node.nextSibling());
           else
-            tqparent.insertBefore(textNode, node);
+            parent.insertBefore(textNode, node);
         }
         else
           node.appendChild(textNode);
@@ -947,7 +947,7 @@ void KafkaWidget::keyDelete()
 #endif
 
                 _nodeParent = _nodeNext.parentNode();
-                //If this empty text contains the cursor, change node to its tqparent.
+                //If this empty text contains the cursor, change node to its parent.
                 if(_nodeNext == _node && _nodeParent.firstChild() == _nodeNext &&
                         _nodeNext.nextSibling().isNull())
                 {
@@ -964,7 +964,7 @@ void KafkaWidget::keyDelete()
         //Else if the current Node is a BLOCK which can be entered/leaved e.g. H1
         else if(attrs->chCurFoc() == kNodeAttrs::blockNode)
         {
-            //First look if it is one of _node's tqparent
+            //First look if it is one of _node's parent
             isParent = false;
             temp = _node;
             while(!temp.isNull())
@@ -1127,7 +1127,7 @@ void KafkaWidget::keyDelete()
 #endif
 
             _nodeParent = _nodeNext.parentNode();
-            //If this block is used to define the cursor pos, change node to its tqparent.
+            //If this block is used to define the cursor pos, change node to its parent.
             if(_nodeNext == _node && _nodeParent.firstChild() == _nodeNext &&
                     _nodeNext.nextSibling().isNull())
             {
@@ -1392,7 +1392,7 @@ void KafkaWidget::keyBackspace()
         //Else if the current Node if a BLOCK which can be entered/leaved e.g. H1, P
         else if(attrs->chCurFoc() == kNodeAttrs::blockNode)
         {
-            //First look if it is one of _node's tqparent
+            //First look if it is one of _node's parent
             isParent = false;
             temp = _node;
             while(!temp.isNull())
diff --git a/quanta/parts/kafka/kafkahtmlpart.h b/quanta/parts/kafka/kafkahtmlpart.h
index c0c1012f..c8ff05f0 100644
--- a/quanta/parts/kafka/kafkahtmlpart.h
+++ b/quanta/parts/kafka/kafkahtmlpart.h
@@ -48,7 +48,7 @@ class KafkaWidget : public KHTMLPart
     Q_OBJECT
   TQ_OBJECT
 public:
-    KafkaWidget(TQWidget *tqparent, TQWidget *widgetParent, KafkaDocument *part,
+    KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part,
                 const char *name = 0);
     ~KafkaWidget();
 
@@ -85,7 +85,7 @@ public:
     * @param goUp A needed boolean for several consecutive call to
     * this function. Setting it to false by default, or to true if we don't want to go through
     * the childs of _node.
-    * @param skipParentNodes Specifies if we should skip the tqparent Node when going up :
+    * @param skipParentNodes Specifies if we should skip the parent Node when going up :
     * this implies that Nodes will not be returned two times.
     * @param dontBlock Specifies if the search should or not be blocked by BlockingTags.
     * @param _endNode Specifies at which DOM::Node the search should end. It is useful
@@ -115,7 +115,7 @@ public:
     /**
      * It will move DOM::Nodes from startNode to endNode as tqchildren of newParent. It does NOT check
      * if the move is valid, so it may crash. Please check before with kafkaCommon::parentSupports().
-     * @param newParent The new tqparent of the DOM::Nodes.
+     * @param newParent The new parent of the DOM::Nodes.
      * @param startNode The first node to move.
      * @param endNode Starting from endNode, the last sibling to move.
      * @param refNode The reference DOM::Node.
@@ -151,7 +151,7 @@ public slots:
     * sections, and entity references) separates Text nodes, i.e., there are
     * neither adjacent Text nodes nor empty Text nodes.
     * Should be used instead of DOM::Node::normalize().
-    * @param _node This node is the tqparent node of the childs normalized
+    * @param _node This node is the parent node of the childs normalized
     */
     void normalize(DOM::Node _node);
 
@@ -211,7 +211,7 @@ signals:
     /**
      * Is emitted whenever a DOM::Node is about to be moved in the tree.
      * @param node The DOM::Node which will be moved.
-     * @param newParent The new tqparent of domNode.
+     * @param newParent The new parent of domNode.
      * @param before domNode will be placed before before.
             * @param modifs The changes made are logged into modifs.
      */
diff --git a/quanta/parts/kafka/kafkasyncoptions.cpp b/quanta/parts/kafka/kafkasyncoptions.cpp
index 45170859..e7066187 100644
--- a/quanta/parts/kafka/kafkasyncoptions.cpp
+++ b/quanta/parts/kafka/kafkasyncoptions.cpp
@@ -25,8 +25,8 @@
 #include "kafkasyncoptions.h"
 #include "kafkasyncoptions.moc"
 
-KafkaSyncOptions::KafkaSyncOptions( KConfig *a_config, TQWidget* tqparent,  const char* name )
-    : KafkaSyncOptionsUI( tqparent, name )
+KafkaSyncOptions::KafkaSyncOptions( KConfig *a_config, TQWidget* parent,  const char* name )
+    : KafkaSyncOptionsUI( parent, name )
 {
 	config = a_config;
 
diff --git a/quanta/parts/kafka/kafkasyncoptions.h b/quanta/parts/kafka/kafkasyncoptions.h
index 85a1eb88..63e58552 100644
--- a/quanta/parts/kafka/kafkasyncoptions.h
+++ b/quanta/parts/kafka/kafkasyncoptions.h
@@ -28,7 +28,7 @@ class KafkaSyncOptions : public KafkaSyncOptionsUI
   TQ_OBJECT
 
 public:
-    KafkaSyncOptions( KConfig *config, TQWidget* tqparent = 0, const char* name = 0);
+    KafkaSyncOptions( KConfig *config, TQWidget* parent = 0, const char* name = 0);
     ~KafkaSyncOptions();
 
     void updateConfig();
diff --git a/quanta/parts/kafka/nodeenhancer.h b/quanta/parts/kafka/nodeenhancer.h
index 6e8bc44c..376379f1 100644
--- a/quanta/parts/kafka/nodeenhancer.h
+++ b/quanta/parts/kafka/nodeenhancer.h
@@ -45,7 +45,7 @@ public:
 	 * The DOM::Node must be built before calling this
 	 * function.
 	 * @param node The Node we want to enhance.
-	 * @param parentDNode the tqparent DOM::Node of the root DOM::Node of node.
+	 * @param parentDNode the parent DOM::Node of the root DOM::Node of node.
 	 * @param nextDNode the DOM::Node next to the root DOM::Node of node.
 	 */
 	virtual bool enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode) = 0;
diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp
index 85f23398..647709b1 100644
--- a/quanta/parts/kafka/undoredo.cpp
+++ b/quanta/parts/kafka/undoredo.cpp
@@ -59,7 +59,7 @@ NodeModif::~NodeModif()
 {
   if(m_node)
   {
-    m_node->tqparent = 0L;
+    m_node->parent = 0L;
     m_node->next = 0L;
     m_node->prev = 0L;
     if(m_type == NodeRemoved)
@@ -87,7 +87,7 @@ void NodeModif::setNode(Node *node)
     m_node = node;
     if(m_node)
     {
-      m_node->tqparent = 0L;
+      m_node->parent = 0L;
       m_node->next = 0L;
       m_node->prev = 0L;
       if(m_type == NodeRemoved)
@@ -544,14 +544,14 @@ bool undoRedo::undoNodeModif(NodeModif *nodeModif)
     node = kafkaCommon::getNodeFromLocation(nodeModif->location());
     if(!node)
     {
-      // No node at this location, getting the tqparent Node and appending newNode after
-      // the last child of the tqparent.
+      // No node at this location, getting the parent Node and appending newNode after
+      // the last child of the parent.
       ref = nodeModif->location();
       TQValueList<int> loc(ref);
       loc.remove(loc.fromLast());
       if(loc.empty())
       {
-        // No tqparent, adding it on top of the tree.
+        // No parent, adding it on top of the tree.
         kafkaCommon::insertNode(newNode, 0L, 0L, 0L, false);
       }
       else
@@ -568,7 +568,7 @@ bool undoRedo::undoNodeModif(NodeModif *nodeModif)
     else
     {
       // A node is already here. Moving it to the right and adding newNode here.
-      kafkaCommon::insertNode(newNode, node->tqparent, node, 0L, false);
+      kafkaCommon::insertNode(newNode, node->parent, node, 0L, false);
     }
   }
   if(nodeModif->type() == NodeModif::NodeTreeRemoved)
@@ -756,7 +756,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                                   while(n->next)
                                           n = n->next;
                           }
-                          if(n->tqparent->_leafNode.isNull())
+                          if(n->parent->_leafNode.isNull())
                           {
                                   dm = domNode.nextSibling();
                                   goUp = false;
@@ -771,7 +771,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/)
                           }
                           else
                           {
-                                  domNode2 = n->tqparent->_leafNode;
+                                  domNode2 = n->parent->_leafNode;
                                   while(!domNode.nextSibling().isNull())
                                   {
                                           //try{
@@ -968,15 +968,15 @@ void undoRedo::reloadQuantaEditor(bool force, bool syncQuantaCursor, bool encode
   while(node)
   {
     //kdDebug(25001)<< "CurNode : " << _node->tag->name << " - " << _node->tag->tagStr() << endl;
-    if(node->tqparent)
+    if(node->parent)
     {
-      node->tqparent->tag->beginPos(bLine3, bCol3);
-      node->tqparent->tag->endPos(eLine3, eCol3);
+      node->parent->tag->beginPos(bLine3, bCol3);
+      node->parent->tag->endPos(eLine3, eCol3);
     }
     node->tag->beginPos(bLine2, bCol2);
 
     //if we are in a Script inside a tag e.g. <a href="<? PHP stuff here ?>">, skip it
-    if(node->tag->type == Tag::ScriptTag && node->tqparent &&
+    if(node->tag->type == Tag::ScriptTag && node->parent &&
         QuantaCommon::isBetween(bLine2, bCol2, bLine3, bCol3, eLine3,eCol3) == 0)
     {
       goUp = true;
@@ -990,7 +990,7 @@ void undoRedo::reloadQuantaEditor(bool force, bool syncQuantaCursor, bool encode
       allText += node->tag->tagStr();
 
       //If a child is a Script inside this Tag e.g. <a href="<? PHP stuff here ?>">, make
-      //its position fits inside the tqparent
+      //its position fits inside the parent
       node->tag->beginPos(bLine3, bCol3);
       node->tag->endPos(eLine3, eCol3);
       child = node->firstChild();
diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp
index 735e8c51..3ed2c464 100644
--- a/quanta/parts/kafka/wkafkapart.cpp
+++ b/quanta/parts/kafka/wkafkapart.cpp
@@ -61,7 +61,7 @@
 KafkaWidget *kafkaWidget;
 KafkaDocument *kafkaDoc;
 
-KafkaDocument::KafkaDocument(TQWidget *tqparent, TQWidget *widgetParent, const char *name)
+KafkaDocument::KafkaDocument(TQWidget *parent, TQWidget *widgetParent, const char *name)
 :domNodeProps(1021), _docLoaded(false)
 {
 // i18n reserve
@@ -88,7 +88,7 @@ TQString ab = i18n("Ident all");
 
 	kafkaDoc = this;
 
-	m_kafkaPart = new KafkaWidget(tqparent, widgetParent,this, name);
+	m_kafkaPart = new KafkaWidget(parent, widgetParent,this, name);
 	kafkaWidget = m_kafkaPart;
 	//m_kafkaPart->showDomTree();
 	m_currentDoc = 0L;
@@ -513,7 +513,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 	DOM::Node newNode, newNode2, attr, nextNode, parentNode, *ptDomNode;
 	bool removeLeftWhitespaces, removeRightWhitespaces;
 	TQString str, nodeValue;
-	Node *n, *tqparent;
+	Node *n, *parent;
 	int i;
 
 //     Don't create DOM::Nodes from Quanta empty nodes outside the body or inside other not allowed element, or KHTML
@@ -526,7 +526,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
         else
             canInsertEmptyNode = kafkaCommon::hasParent(node, "body");
 
-        Node* parent_node = node->tqparent;
+        Node* parent_node = node->parent;
         TQTag* parent_node_description_tag = QuantaCommon::tagFromDTD(parent_node);
         if(parent_node_description_tag && !parent_node_description_tag->isChild(node, false, true))
             canInsertEmptyNode = false;
@@ -540,7 +540,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 		//The basics DOM::Nodes HTML, HEAD and BODY are loaded anyway, but we must now
 		// link the real  HTML,... to their Nodes.
 		//A basic Common tree is !doctype<-html<-(head, body)
-		if(!node->tqparent)
+		if(!node->parent)
 		{//FIXME:html, head and body are HTML-specific tag, for others DTDs it might result to some pbs.
 			if(str == "html")
 			{
@@ -575,30 +575,30 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 				}
 			}
 		}
-		else if(str == "html" && (!node->tqparent || (node->tqparent && !node->tqparent->tqparent)))
+		else if(str == "html" && (!node->parent || (node->parent && !node->parent->parent)))
 		{
 			if(!html.isNull())//delete the empty Node
 				disconnectDomNodeFromQuantaNode(html);
 			newNode = html;
 			insertNode = false;
 			}
-		else if(str == "body" && ((node->tqparent && !node->tqparent->tqparent) || (node->tqparent &&
-			 node->tqparent->tqparent && !node->tqparent->tqparent->tqparent)))
+		else if(str == "body" && ((node->parent && !node->parent->parent) || (node->parent &&
+			 node->parent->parent && !node->parent->parent->parent)))
 		{
 			if(!body.isNull())
 				disconnectDomNodeFromQuantaNode(body);
 			newNode = body;
 			insertNode = false;
 		}
-		else if(str == "head" && ((node->tqparent && !node->tqparent->tqparent) || (node->tqparent &&
-			 node->tqparent->tqparent && !node->tqparent->tqparent->tqparent)))
+		else if(str == "head" && ((node->parent && !node->parent->parent) || (node->parent &&
+			 node->parent->parent && !node->parent->parent->parent)))
 		{
 			if(!head.isNull())
 				disconnectDomNodeFromQuantaNode(head);
 			newNode = head;
 			insertNode = false;
 		}
-	/**	else if(node->tqparent->tag->str == "html")*/
+	/**	else if(node->parent->tag->str == "html")*/
 		else
 		{
             if(node->tag->type == Tag::Text || node->tag->type == Tag::Empty)
@@ -631,16 +631,16 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 			//- It is the last child of a BLOCK
 			removeLeftWhitespaces = false;
 			n = node;
-			tqparent = node->tqparent;
-			while(tqparent && tqparent->SFirstChild() == n)
+			parent = node->parent;
+			while(parent && parent->SFirstChild() == n)
 			{
-				if(!kafkaCommon::isInline(tqparent->tag->name))
+				if(!kafkaCommon::isInline(parent->tag->name))
 				{
 					removeLeftWhitespaces = true;
 					break;
 				}
-				n = tqparent;
-				tqparent = tqparent->tqparent;
+				n = parent;
+				parent = parent->parent;
 			}
 			if(!removeLeftWhitespaces)
 			{
@@ -661,16 +661,16 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 
 			removeRightWhitespaces = false;
 			n = node;
-			tqparent = node->tqparent;
-			while(tqparent && tqparent->SLastChild() == n)
+			parent = node->parent;
+			while(parent && parent->SLastChild() == n)
 			{
-				if(!kafkaCommon::isInline(tqparent->tag->name))
+				if(!kafkaCommon::isInline(parent->tag->name))
 				{
 					removeRightWhitespaces = true;
 					break;
 				}
-				n = tqparent;
-				tqparent = tqparent->tqparent;
+				n = parent;
+				parent = parent->parent;
 			}
 
 			nodeValue = node->tag->tagStr();
@@ -714,11 +714,11 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 						break;
 				}
 			}
-			if(node->tqparent && node->tqparent->leafNode())
-				parentNode = *node->tqparent->leafNode();
-			else if(node->tqparent && !node->tqparent->leafNode())
+			if(node->parent && node->parent->leafNode())
+				parentNode = *node->parent->leafNode();
+			else if(node->parent && !node->parent->leafNode())
 			{
-				//the tqparent tag was invalid and khtml refuse to insert it
+				//the parent tag was invalid and khtml refuse to insert it
 				//so impossible to inser the current node
 				disconnectDomNodeFromQuantaNode(newNode);
 				if(node->rootNode())
@@ -774,8 +774,8 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode)
 	}
 	else
 	{
-		if(node->tqparent && node->tqparent->leafNode())
-			parentNode = *node->tqparent->leafNode();
+		if(node->parent && node->parent->leafNode())
+			parentNode = *node->parent->leafNode();
 		else
 			parentNode = body;
 		n = node;
@@ -1697,13 +1697,13 @@ void KafkaDocument::translateNodeIntoQuantaCursorPosition(Node *node, int offset
   }
 }
 
-bool KafkaDocument::insertDomNode(DOM::Node node, DOM::Node tqparent,
+bool KafkaDocument::insertDomNode(DOM::Node node, DOM::Node parent,
 	DOM::Node nextSibling, DOM::Node rootNode)
 {
 	DOM::Node siblingNSpecial;
 
 	//First insert the node
-	if(!kafkaCommon::insertDomNode(node, tqparent, nextSibling, rootNode))
+	if(!kafkaCommon::insertDomNode(node, parent, nextSibling, rootNode))
 		return false;
 
 	//Then unEnhance and reEnhance the nearest non special nodes so that everything's fine.
@@ -1728,12 +1728,12 @@ bool KafkaDocument::insertDomNode(DOM::Node node, DOM::Node tqparent,
 
 bool KafkaDocument::removeDomNode(DOM::Node node)
 {
-	DOM::Node nextSiblingNSpecial, prevSiblingNSpecial, tqparent;
+	DOM::Node nextSiblingNSpecial, prevSiblingNSpecial, parent;
 
 	//First remove the node
 	prevSiblingNSpecial = getPrevSiblingNSpecial(node);
 	nextSiblingNSpecial = getNextSiblingNSpecial(node);
-	tqparent = node.parentNode();
+	parent = node.parentNode();
 	if(!kafkaCommon::removeDomNode(node))
 		return false;
 
@@ -1748,8 +1748,8 @@ bool KafkaDocument::removeDomNode(DOM::Node node)
 		mainEnhancer->postUnenhanceNode(nextSiblingNSpecial);
 		mainEnhancer->postEnhanceNode(nextSiblingNSpecial);
 	}
-	mainEnhancer->postUnenhanceNode(tqparent);
-	mainEnhancer->postEnhanceNode(tqparent);
+	mainEnhancer->postUnenhanceNode(parent);
+	mainEnhancer->postEnhanceNode(parent);
 
 	return true;
 }
@@ -2080,13 +2080,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 
 	//If we are deleting a PHP Node which is embedded into a tag e.g. <a <? echo boo; ?> >
 	//We must regenerate the <a> tag string.
-	if(_node->tag->type == Tag::ScriptTag && _node->tqparent)
+	if(_node->tag->type == Tag::ScriptTag && _node->parent)
 	{
-		_node->tqparent->tag->beginPos(bLine, bCol);
-		_node->tqparent->tag->endPos(eLine, eCol);
+		_node->parent->tag->beginPos(bLine, bCol);
+		_node->parent->tag->endPos(eLine, eCol);
 		_node->tag->beginPos(bLine2, bCol2);
 		if(QuantaCommon::isBetween(bLine2, bCol2, bLine, bCol, eLine,eCol) == 0)
-			_node->tqparent->tag->setCleanStrBuilt(false);
+			_node->parent->tag->setCleanStrBuilt(false);
 	}
 
 	if(_node->prev)
@@ -2099,15 +2099,15 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 			modif = new NodeModif();
 			modif->setType(NodeModif::NodeRemoved);
 			modif->setLocation(kafkaCommon::getLocation(_node));
-			if(_node->tqparent && _node->tqparent->child == _node)
-				_node->tqparent->child = _node->next;
+			if(_node->parent && _node->parent->child == _node)
+				_node->parent->child = _node->next;
 			if(_node->prev)
 				_node->prev->next = _node->next;
 			if(_node->next)
 				_node->next->prev = _node->prev;
 			if(_node == baseNode)
 				baseNode = _node->next;
-			_node->tqparent = 0L;
+			_node->parent = 0L;
 			_node->prev = 0L;
 			_node->next = 0L;
 			_node->child = 0L;
@@ -2131,8 +2131,8 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 		hasClosingNode = false;
 	//_node->removeAll = false;
 
-	if(_node->tqparent && _node->tqparent->child == _node)
-		_node->tqparent->child = _node->next;
+	if(_node->parent && _node->parent->child == _node)
+		_node->parent->child = _node->next;
 	if(_node->next)
 		_node->next->prev = _node->prev;
 	if(_node->prev)
@@ -2155,15 +2155,15 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 	}
 	else if(_node->child)// && !deleteChilds
 	{
-    if(_node->tqparent && !_node->tqparent->child)
-			_node->tqparent->child = _node->child;
+    if(_node->parent && !_node->parent->child)
+			_node->parent->child = _node->child;
 		if(_node->prev)
 			_node->prev->next = _node->child;
 		_tmpNode = _node->child;
 		while(_tmpNode)
 		{
 			i++;
-			_tmpNode->tqparent = _node->tqparent;
+			_tmpNode->parent = _node->parent;
 			n = _tmpNode;
 			_tmpNode = _tmpNode->next;
 			if(!_tmpNode)
@@ -2181,7 +2181,7 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 		disconnectDomNodeFromQuantaNode(*_node->rootNode());
 	if(_node->leafNode())
 		disconnectDomNodeFromQuantaNode(*_node->leafNode());
-	_node->tqparent = 0L;
+	_node->parent = 0L;
 	_nodeNext = _node->next;
 	_node->next = 0L;
 	_node->prev = 0L;
@@ -2195,13 +2195,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 	if(hasClosingNode)
 	{
 		//delete the closing Node if present
-		if(_node->tqparent && _node->tqparent->child == _node)
-			_node->tqparent->child = _node->next;
+		if(_node->parent && _node->parent->child == _node)
+			_node->parent->child = _node->next;
 		if(_node->prev)
 			_node->prev->next = _node->next;
 		if(_node->next)
 			_node->next->prev = _node->prev;
-		_node->tqparent = 0L;
+		_node->parent = 0L;
 		_nodeNext = _node->next;
 		_node->next = 0L;
 		_node->prev = 0L;
@@ -2221,13 +2221,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 		modif = new NodeModif();
 		modif->setType(NodeModif::NodeRemoved);
 		modif->setLocation(kafkaCommon::getLocation(_node));
-		if(_node->tqparent && _node->tqparent->child == _node)
-			_node->tqparent->child = _node->next;
+		if(_node->parent && _node->parent->child == _node)
+			_node->parent->child = _node->next;
 		if(_node->prev)
 			_node->prev->next = _node->next;
 		if(_node->next)
 			_node->next->prev = _node->prev;
-		_node->tqparent = 0L;
+		_node->parent = 0L;
 		_nodeNext = _node->next;
 		_node->prev = 0L;
 		_node->next = 0L;
@@ -2251,13 +2251,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC
 
 void KafkaDocument::slotDomNodeIsAboutToBeMoved(DOM::Node domNode, DOM::Node newParent, DOM::Node before, NodeModifsSet* modifs)
 {
-	Node *node, *tqparent, *nextSibling, *closingNode;
+	Node *node, *parent, *nextSibling, *closingNode;
 
 	if(domNode.isNull())
 		return;
 
 	node = getNode(domNode);
-	tqparent = getNode(newParent);
+	parent = getNode(newParent);
 	nextSibling = getNode(before);
 
 	if(!node)
@@ -2265,10 +2265,10 @@ void KafkaDocument::slotDomNodeIsAboutToBeMoved(DOM::Node domNode, DOM::Node new
 
 	closingNode = node->getClosingNode();
 
-	kafkaCommon::moveNode(node, tqparent, nextSibling, modifs, false);
+	kafkaCommon::moveNode(node, parent, nextSibling, modifs, false);
 
 	if(closingNode)
-		kafkaCommon::moveNode(closingNode, tqparent, nextSibling, modifs, false);
+		kafkaCommon::moveNode(closingNode, parent, nextSibling, modifs, false);
 
 }
 
diff --git a/quanta/parts/kafka/wkafkapart.h b/quanta/parts/kafka/wkafkapart.h
index 3c0ca23c..bdab7ede 100644
--- a/quanta/parts/kafka/wkafkapart.h
+++ b/quanta/parts/kafka/wkafkapart.h
@@ -53,10 +53,10 @@ Q_OBJECT
   TQ_OBJECT
 public:
         /** Returns a reference to the KafkaDocument object */
-        static KafkaDocument* const ref(TQWidget *tqparent = 0L, TQWidget *widgetParent = 0L, const char *name = 0L)
+        static KafkaDocument* const ref(TQWidget *parent = 0L, TQWidget *widgetParent = 0L, const char *name = 0L)
         {
           static KafkaDocument *m_ref;
-          if (!m_ref) m_ref = new KafkaDocument(tqparent, widgetParent, name);
+          if (!m_ref) m_ref = new KafkaDocument(parent, widgetParent, name);
           return m_ref;
         }
 
@@ -161,7 +161,7 @@ public:
 	 * and thus make them its childs. Usefull when adding a Node on a selected range of Nodes.
 	 * It also create empty Nodes between Nodes.
 	 * @param domNode The Node returned is synchronized from this DOM::Node.
-	 * @param nodeParent The tqparent Node of the Node returned.
+	 * @param nodeParent The parent Node of the Node returned.
 	 * @param beginNode The new Node will be placed before or within _beginNode.
 	 * @param beginOffset NOT IMLEMENTED If set to 0 or -1, the new Node will be placed before _beginNode,
 	 * else _beginNode will be splitted at offset #beginOffset and the new Node will be placed
@@ -309,12 +309,12 @@ public:
 	 * Insert a DOM::Node in the DOM::Node tree. It takes care to handle the exceptions and
 	 * to postEnhance (cf htmlenhancer.h)
 	 * @param node The node to insert.
-	 * @param tqparent The new tqparent of node. If null, insert node at the top level.
+	 * @param parent The new parent of node. If null, insert node at the top level.
 	 * @param nextSibling The new next sibling of node. If null, append node at the end of the child list.
-	 * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no tqparent is provided.
+	 * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no parent is provided.
 	 * @return Returns true if the operation was successfull.
 	 */
-	bool insertDomNode(DOM::Node node, DOM::Node tqparent = DOM::Node(),
+	bool insertDomNode(DOM::Node node, DOM::Node parent = DOM::Node(),
 		DOM::Node nextSibling = DOM::Node(), DOM::Node rootNode = DOM::Node());
 
 
@@ -369,7 +369,7 @@ public:
 	/**
 	 * Prints in stdout the current Node tree + Node->DOM::Node->Node relationship.
 	 * @node The startNode
-	 * @indent The number of little dots per tqparent relationship.
+	 * @indent The number of little dots per parent relationship.
 	 */
 	void coutLinkTree(Node *node, int indent);
 
@@ -433,7 +433,7 @@ public slots:
 	/**
 	 * Called whenever a DOM::Node is moved.
 	 * @param domNode The DOM::Node to move.
-	 * @param newParent The new tqparent DOM::Node of domNode.
+	 * @param newParent The new parent DOM::Node of domNode.
 	 * @param before domNode will be inserted before before.
          * @param modifs The changes made are logged into modifs.
 	 */
@@ -460,7 +460,7 @@ private:
 	/**
 	 * Create a KafkaWidget.
 	 */
-	KafkaDocument(TQWidget *tqparent, TQWidget *widgetParent, const char *name);
+	KafkaDocument(TQWidget *parent, TQWidget *widgetParent, const char *name);
 
   TQMap<TQString, TQString> decodedChars;
 	TQMap<TQString, TQString> encodedChars;
diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp
index bfac210f..3979bb8b 100644
--- a/quanta/parts/preview/whtmlpart.cpp
+++ b/quanta/parts/preview/whtmlpart.cpp
@@ -34,10 +34,10 @@
 #include "resource.h"
 
 WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enableViewSource, 
-            TQObject *tqparent, const char *name, GUIProfile prof)
-  : KHTMLPart(parentWidget, widgetName, tqparent, name, prof), m_contextMenu(0)
+            TQObject *parent, const char *name, GUIProfile prof)
+  : KHTMLPart(parentWidget, widgetName, parent, name, prof), m_contextMenu(0)
 {
-  //kdDebug(24000) << "WHTMLPart: " << parentWidget << " " << widgetName << " " << tqparent << " " << name << this << endl;
+  //kdDebug(24000) << "WHTMLPart: " << parentWidget << " " << widgetName << " " << parent << " " << name << this << endl;
    hpos = 0;
    // get settings from konq.
    KConfig konqConfig("konquerorrc");
@@ -150,12 +150,12 @@ bool WHTMLPart::forwardEnable()
 }
 
 KParts::ReadOnlyPart *WHTMLPart::createPart( TQWidget * parentWidget, const char *widgetName, 
-                                            TQObject *tqparent, const char *name,
+                                            TQObject *parent, const char *name,
                                             const TQString &, TQString &,
                                             TQStringList &, const TQStringList &)
 {
-  //kdDebug(24000) << "Create WHTMLPart: " << parentWidget << " " << widgetName << " " << tqparent << " " << name << endl;
-  return new WHTMLPart(parentWidget, widgetName, m_enableViewSource, tqparent, name);
+  //kdDebug(24000) << "Create WHTMLPart: " << parentWidget << " " << widgetName << " " << parent << " " << name << endl;
+  return new WHTMLPart(parentWidget, widgetName, m_enableViewSource, parent, name);
 }
 
 bool WHTMLPart::eventFilter(TQObject *watched, TQEvent *e)
diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h
index 91f88b1e..2ec05dfe 100644
--- a/quanta/parts/preview/whtmlpart.h
+++ b/quanta/parts/preview/whtmlpart.h
@@ -32,7 +32,7 @@ class WHTMLPart : public KHTMLPart  {
   TQ_OBJECT
 public:
   WHTMLPart(TQWidget *parentWidget = 0, const char *widgetname = 0, bool enableViewSource = false,
-            TQObject *tqparent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
+            TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI );
   virtual ~WHTMLPart();
 
   /** Specify the URL where the preview was started */
@@ -62,7 +62,7 @@ signals:
 protected:
   virtual void urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args = KParts::URLArgs());
   virtual KParts::ReadOnlyPart *createPart( TQWidget *parentWidget, const char *widgetName,
-                                            TQObject *tqparent, const char *name,
+                                            TQObject *parent, const char *name,
                                             const TQString &mimetype, TQString &serviceName,
                                             TQStringList &serviceTypes, const TQStringList &params);