diff options
Diffstat (limited to 'kmail/kmfoldermgr.cpp')
| -rw-r--r-- | kmail/kmfoldermgr.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index a37f9136..383f562a 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -366,20 +366,20 @@ void KMFolderMgr::removeFolder(KMFolder* aFolder) aFolder->remove(); } -KMFolder* KMFolderMgr::tqparentFolder( KMFolder* folder ) +KMFolder* KMFolderMgr::parentFolder( KMFolder* folder ) { // find the tqparent folder by stripping "." and ".directory" from the name KMFolderDir* fdir = folder->tqparent(); - TQString tqparentName = fdir->name(); - tqparentName = tqparentName.mid( 1, tqparentName.length()-11 ); - KMFolderNode* tqparent = fdir->hasNamedFolder( tqparentName ); + 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( tqparentName ); + tqparent = fdir->tqparent()->hasNamedFolder( parentName ); - KMFolder* tqparentF = 0; + KMFolder* parentF = 0; if ( tqparent ) - tqparentF = dynamic_cast<KMFolder*>( tqparent ); - return tqparentF; + parentF = dynamic_cast<KMFolder*>( tqparent ); + return parentF; } void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) @@ -397,17 +397,17 @@ void KMFolderMgr::removeFolderAux(KMFolder* aFolder, bool success) break; } } - KMFolder* tqparentF = tqparentFolder( aFolder ); + KMFolder* parentF = parentFolder( aFolder ); // aFolder will be deleted by the next call! aFolder->tqparent()->remove(aFolder); // update the tqchildren state - if ( tqparentF ) + if ( parentF ) { - if ( tqparentF != aFolder ) + if ( parentF != aFolder ) { - tqparentF->storage()->updateChildrenState(); + parentF->storage()->updateChildrenState(); } } else |