1 files changed, 12 insertions, 12 deletions

diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index e66e77761..c4df4904d 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -368,17 +368,17 @@ void KMFolderMgr::removeFolder(KMFolder* aFolder)
 
 KMFolder* KMFolderMgr::parentFolder( KMFolder* folder )
 {
-  // find the tqparent folder by stripping "." and ".directory" from the name
-  KMFolderDir* fdir = folder->tqparent();
+  // find the parent folder by stripping "." and ".directory" from the name
+  KMFolderDir* fdir = folder->parent();
   TQString parentName = fdir->name();
   parentName = parentName.mid( 1, parentName.length()-11 );
-  KMFolderNode* tqparent = fdir->hasNamedFolder( parentName );
-  if ( !tqparent && fdir->tqparent() ) // dimap obviously has a different structure
-    tqparent = fdir->tqparent()->hasNamedFolder( parentName );
+  KMFolderNode* parent = fdir->hasNamedFolder( parentName );
+  if ( !parent && fdir->parent() ) // dimap obviously has a different structure
+    parent = fdir->parent()->hasNamedFolder( parentName );
 
   KMFolder* parentF = 0;
-  if ( tqparent )
-    parentF = dynamic_cast<KMFolder*>( tqparent );
+  if ( parent )
+    parentF = dynamic_cast<KMFolder*>( parent );
   return parentF;
 }
 
@@ -389,7 +389,7 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success)
     return;
   }
 
-  KMFolderDir* fdir = aFolder->tqparent();
+  KMFolderDir* fdir = aFolder->parent();
   KMFolderNode* fN;
   for (fN = fdir->first(); fN != 0; fN = fdir->next()) {
     if (fN->isDir() && (fN->name() == "." + aFolder->fileName() + ".directory")) {
@@ -400,7 +400,7 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success)
   KMFolder* parentF = parentFolder( aFolder );
 
   // aFolder will be deleted by the next call!
-  aFolder->tqparent()->remove(aFolder);
+  aFolder->parent()->remove(aFolder);
 
   // update the tqchildren state
   if ( parentF )
@@ -411,10 +411,10 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success)
     }
   }
   else
-    kdWarning(5006) << "Can not find tqparent folder" << endl;
+    kdWarning(5006) << "Can not find parent folder" << endl;
 
   if (aFolder == mRemoveOrig) {
-    // call only if we're removing the original tqparent folder
+    // call only if we're removing the original parent folder
     contentsChanged();
     mRemoveOrig = 0;
   }
@@ -425,7 +425,7 @@ void KMFolderMgr::removeDirAux(KMFolderDir* aFolderDir)
   TQDir dir;
   TQString folderDirLocation = aFolderDir->path();
   aFolderDir->clear();
-  aFolderDir->tqparent()->remove(aFolderDir);
+  aFolderDir->parent()->remove(aFolderDir);
   dir.rmdir(folderDirLocation);
 }