1 files changed, 13 insertions, 13 deletions

diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index c850cf2ec..5237787ea 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -363,7 +363,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* tqparent
   connect( this, TQT_SIGNAL( changed(bool) ), TQT_SLOT( slotChanged(bool) ) );
 }
 
-// Warning before save() this will return the url of the _tqparent_ folder, when creating a new one
+// Warning before save() this will return the url of the _parent_ folder, when creating a new one
 KURL KMail::FolderDiaACLTab::imapURL() const
 {
   KURL url = mImapAccount->getUrl();
@@ -398,9 +398,9 @@ void KMail::FolderDiaACLTab::load()
   if ( mDlg->folder() ) {
     // existing folder
     initializeWithValuesFromFolder( mDlg->folder() );
-  } else if ( mDlg->tqparentFolder() ) {
+  } else if ( mDlg->parentFolder() ) {
     // new folder
-    initializeWithValuesFromFolder( mDlg->tqparentFolder() );
+    initializeWithValuesFromFolder( mDlg->parentFolder() );
     mChanged = true; // ensure that saving happens
   }
 
@@ -421,7 +421,7 @@ void KMail::FolderDiaACLTab::load()
     mUserIdFormat = UserName;
 
   if ( mFolderType == KMFolderTypeCachedImap ) {
-    KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
+    KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
     KMFolderCachedImap* folderImap = static_cast<KMFolderCachedImap*>( folder->storage() );
     if ( mUserRightsState == KMail::ACLJobs::FetchFailed ||
          folderImap->aclListState() == KMail::ACLJobs::FetchFailed ) {
@@ -450,7 +450,7 @@ void KMail::FolderDiaACLTab::load()
     mLabel->setText( i18n( "Error: no IMAP account defined for this folder" ) );
     return;
   }
-  KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
+  KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
   if ( folder && folder->storage() == mImapAccount->rootFolder() )
     return; // nothing to be done for the (virtual) account folder
   mLabel->setText( i18n( "Connecting to server %1, please wait..." ).tqarg( mImapAccount->host() ) );
@@ -481,7 +481,7 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString
   if ( mUserRightsState != KMail::ACLJobs::Ok ) {
     connect( mImapAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ),
              this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) );
-    KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
+    KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
     mImapAccount->getUserRights( folder, mImapPath );
   }
   else
@@ -495,7 +495,7 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder )
     return;
   }
 
-  if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) {
+  if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) {
     KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() );
     mUserRights = folderImap->userRights();
     mUserRightsState = folderImap->userRightsState();
@@ -506,14 +506,14 @@ void KMail::FolderDiaACLTab::slotReceivedUserRights( KMFolder* folder )
 void KMail::FolderDiaACLTab::startListing()
 {
   // List ACLs of folder - or its tqparent, if creating a new folder
-  mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder(), mImapPath );
+  mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath );
   connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
            this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
 }
 
 void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, KIO::Job* job, const KMail::ACLList& aclList )
 {
-  if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) ) {
+  if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) {
     disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )),
                 this, TQT_SLOT(slotReceivedACL( KMFolder*, KIO::Job*, const KMail::ACLList& )) );
 
@@ -723,15 +723,15 @@ bool KMail::FolderDiaACLTab::save()
 
   mACLList = aclList;
 
-  KMFolderImap* tqparentImap = mDlg->tqparentFolder() ? static_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ) : 0;
+  KMFolderImap* parentImap = mDlg->parentFolder() ? static_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ) : 0;
 
   if ( mDlg->isNewFolder() ) {
     // The folder isn't created yet, wait for it
     // It's a two-step process (mkdir+listDir) so we wait for the dir listing to be complete
-    connect( tqparentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ),
+    connect( parentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ),
              this, TQT_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) );
   } else {
-      slotDirectoryListingFinished( tqparentImap );
+      slotDirectoryListingFinished( parentImap );
   }
   return true;
 }
@@ -739,7 +739,7 @@ bool KMail::FolderDiaACLTab::save()
 void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f)
 {
   if ( !f ||
-       f != static_cast<KMFolderImap*>( mDlg->tqparentFolder()->storage() ) ||
+       f != static_cast<KMFolderImap*>( mDlg->parentFolder()->storage() ) ||
        !mDlg->folder() ||
        !mDlg->folder()->storage() ) {
     emit readyForAccept();