1 files changed, 13 insertions, 13 deletions

diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index cb9c420ac..0b79d98c0 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -208,20 +208,20 @@ namespace KMail {
       myBody->Headers().Parse();
     }
 
-    partNode* tqparentNode = &startNode;
+    partNode* parentNode = &startNode;
     partNode* newNode = new partNode(false, myBody);
 
     // Build the object tree of the new node before setting the tqparent, as otherwise
-    // buildObjectTree() would erronously modify the tqparents as well
+    // buildObjectTree() would erronously modify the parents as well
     newNode->buildObjectTree( false );
 
-    if ( append && tqparentNode->firstChild() ) {
-      tqparentNode = tqparentNode->firstChild();
-      while( tqparentNode->nextSibling() )
-        tqparentNode = tqparentNode->nextSibling();
-      tqparentNode->setNext( newNode );
+    if ( append && parentNode->firstChild() ) {
+      parentNode = parentNode->firstChild();
+      while( parentNode->nextSibling() )
+        parentNode = parentNode->nextSibling();
+      parentNode->setNext( newNode );
     } else
-      tqparentNode->setFirstChild( newNode );
+      parentNode->setFirstChild( newNode );
 
     if ( startNode.mimePartTreeItem() ) {
       newNode->fillMimePartTree( startNode.mimePartTreeItem(), 0,
@@ -260,7 +260,7 @@ namespace KMail {
       node->setProcessed( false, false );
       if ( partNode * child = node->firstChild() )
         child->setProcessed( false, true );
-    } else if ( mReader && !node->tqparentNode() ) {
+    } else if ( mReader && !node->parentNode() ) {
       // ...this node and all it's siblings and descendants
       node->setProcessed( false, true );
     }
@@ -338,7 +338,7 @@ namespace KMail {
     const AttachmentStrategy * as = attachmentStrategy();
     if ( as && as->defaultDisplay( node ) == AttachmentStrategy::None &&
          !showOnlyOneMimePart() &&
-         node->tqparentNode() /* message is not an attachment */ ) {
+         node->parentNode() /* message is not an attachment */ ) {
       node->setDisplayedHidden( true );
       return;
     }
@@ -1544,9 +1544,9 @@ namespace KMail {
     }
 
     const Kleo::CryptoBackend::Protocol* oldUseThisCryptPlug = cryptoProtocol();
-    if (    node->tqparentNode()
-            && DwMime::kTypeMultipart    == node->tqparentNode()->type()
-            && DwMime::kSubtypeEncrypted == node->tqparentNode()->subType() ) {
+    if (    node->parentNode()
+            && DwMime::kTypeMultipart    == node->parentNode()->type()
+            && DwMime::kSubtypeEncrypted == node->parentNode()->subType() ) {
       //kdDebug(5006) << "\n----->  Initially processing encrypted data\n" << endl;
       node->setEncryptionState( KMMsgFullyEncrypted );
       if ( keepEncryptions() ) {