diff options
Diffstat (limited to 'kmail/kmfolderdia.cpp')
| -rw-r--r-- | kmail/kmfolderdia.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index 9d514614..a7ebe5c1 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -272,8 +272,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, // Determine if we are allowed to rename this folder. Only possible if the folder supports // ACLs. bool nameChangeAllowed = true; - if ( mDlg->folder() && mDlg->tqparentFolder() && - mDlg->folder()->storage() && mDlg->tqparentFolder()->storage() && + if ( mDlg->folder() && mDlg->parentFolder() && + mDlg->folder()->storage() && mDlg->parentFolder()->storage() && ( mDlg->folder()->folderType() == KMFolderTypeCachedImap || mDlg->folder()->folderType() == KMFolderTypeImap ) ) { ImapAccountBase *account = 0; @@ -289,31 +289,31 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, } if ( account && account->hasACLSupport() ) { - int tqparentRights = -1; + int parentRights = -1; int folderRights = -1; - bool tqparentRightsOk = false; + bool parentRightsOk = false; bool folderRightsOk = false; if ( imap ) { - KMFolderImap * const tqparent = dynamic_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ); + KMFolderImap * const tqparent = dynamic_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ); folderRights = imap->userRights(); folderRightsOk = imap->userRightsState() == KMail::ACLJobs::Ok; if ( tqparent ) { - tqparentRights = tqparent->userRights(); - tqparentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; + parentRights = tqparent->userRights(); + parentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; } } else if ( dimap ) { - KMFolderCachedImap * const tqparent = dynamic_cast<KMFolderCachedImap*>( mDlg->tqparentFolder()->storage() ); + KMFolderCachedImap * const tqparent = dynamic_cast<KMFolderCachedImap*>( mDlg->parentFolder()->storage() ); folderRights = dimap->userRights(); folderRightsOk = dimap->userRightsState() == KMail::ACLJobs::Ok; if ( tqparent ) { - tqparentRights = tqparent->userRights(); - tqparentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; + parentRights = tqparent->userRights(); + parentRightsOk = tqparent->userRightsState() == KMail::ACLJobs::Ok; } } // For renaming, we need support for deleting the mailbox and then re-creating it. - if ( tqparentRightsOk && folderRightsOk && - ( !( tqparentRights & KMail::ACLJobs::Create ) || !( folderRights & KMail::ACLJobs::Delete ) ) ) { + if ( parentRightsOk && folderRightsOk && + ( !( parentRights & KMail::ACLJobs::Create ) || !( folderRights & KMail::ACLJobs::Delete ) ) ) { nameChangeAllowed = false; } } @@ -702,9 +702,9 @@ bool FolderDiaGeneralTab::save() else fldName = oldFldName; - if ( mDlg->tqparentFolder() && - mDlg->tqparentFolder()->folderType() != KMFolderTypeImap && - mDlg->tqparentFolder()->folderType() != KMFolderTypeCachedImap ) + if ( mDlg->parentFolder() && + mDlg->parentFolder()->folderType() != KMFolderTypeImap && + mDlg->parentFolder()->folderType() != KMFolderTypeCachedImap ) fldName.remove('/'); fldName.remove(TQRegExp("^\\.*")); if (fldName.isEmpty()) fldName = i18n("unnamed"); |