1 files changed, 13 insertions, 13 deletions

diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 25fc6c0f0..63dc91fb5 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -301,9 +301,9 @@ void FolderStorage::emitMsgAddedSignals(int idx)
 bool FolderStorage::canAddMsgNow(KMMessage* aMsg, int* aIndex_ret)
 {
   if (aIndex_ret) *aIndex_ret = -1;
-  KMFolder *msgParent = aMsg->tqparent();
-  // If the message has a tqparent and is in transfer, bail out. If it does not
-  // have a tqparent we want to be able to add it even if it is in transfer.
+  KMFolder *msgParent = aMsg->parent();
+  // If the message has a parent and is in transfer, bail out. If it does not
+  // have a parent we want to be able to add it even if it is in transfer.
   if (aMsg->transferInProgress() && msgParent)
       return false;
   if (!aMsg->isComplete() && msgParent && msgParent->folderType() == KMFolderTypeImap)
@@ -326,7 +326,7 @@ void FolderStorage::reallyAddMsg(KMMessage* aMsg)
     return;
   aMsg->setTransferInProgress( false );
   aMsg->setComplete( true );
-  KMFolder *aFolder = aMsg->tqparent();
+  KMFolder *aFolder = aMsg->parent();
   int index;
   ulong serNum = aMsg->getMsgSerNum();
   bool undo = aMsg->enableUndo();
@@ -463,9 +463,9 @@ void FolderStorage::take(TQPtrList<KMMessage> msgList)
 {
   for ( KMMessage* msg = msgList.first(); msg; msg = msgList.next() )
   {
-    if (msg->tqparent())
+    if (msg->parent())
     {
-      int idx = msg->tqparent()->find(msg);
+      int idx = msg->parent()->find(msg);
       if ( idx >= 0 )
         take(idx);
     }
@@ -621,7 +621,7 @@ FolderJob* FolderStorage::createJob( TQPtrList<KMMessage>& msgList, const TQStri
 int FolderStorage::moveMsg(KMMessage* aMsg, int* aIndex_ret)
 {
   assert(aMsg != 0);
-  KMFolder* msgParent = aMsg->tqparent();
+  KMFolder* msgParent = aMsg->parent();
 
   if (msgParent)
     msgParent->open("moveMsgSrc");
@@ -641,7 +641,7 @@ int FolderStorage::moveMsg(TQPtrList<KMMessage> msglist, int* aIndex_ret)
 {
   KMMessage* aMsg = msglist.first();
   assert(aMsg != 0);
-  KMFolder* msgParent = aMsg->tqparent();
+  KMFolder* msgParent = aMsg->parent();
 
   if (msgParent)
     msgParent->open("foldermovemsg");
@@ -681,7 +681,7 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent)
   close("rename", true);
 
   oldName = folder()->fileName();
-  oldParent = folder()->tqparent();
+  oldParent = folder()->parent();
   if (newParent)
     folder()->setParent( newParent );
 
@@ -723,14 +723,14 @@ int FolderStorage::rename(const TQString& newName, KMFolderDir *newParent)
     }
 
     // if the folder is being moved then move its node and, if necessary, also
-    // the associated subfolder directory node to the new tqparent
+    // the associated subfolder directory node to the new parent
     if (newParent) {
       if (oldParent->findRef( folder() ) != -1)
         oldParent->take();
       newParent->inSort( folder() );
       if ( child ) {
-        if ( child->tqparent()->findRef( child ) != -1 )
-          child->tqparent()->take();
+        if ( child->parent()->findRef( child ) != -1 )
+          child->parent()->take();
         newParent->inSort( child );
         child->setParent( newParent );
       }
@@ -898,7 +898,7 @@ void FolderStorage::msgStatusChanged(const KMMsgtqStatus oldtqStatus,
 void FolderStorage::headerOfMsgChanged(const KMMsgBase* aMsg, int idx)
 {
   if (idx < 0)
-    idx = aMsg->tqparent()->find( aMsg );
+    idx = aMsg->parent()->find( aMsg );
 
   if (idx >= 0 )
   {