1 files changed, 13 insertions, 13 deletions

diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp
index 99954cc2a..4215ba723 100644
--- a/kmail/folderdiaquotatab.cpp
+++ b/kmail/folderdiaquotatab.cpp
@@ -20,11 +20,11 @@
  *
  *  In addition, as a special exception, the copyright holders give
  *  permission to link the code of this program with any edition of
- *  the Qt library by Trolltech AS, Norway (or with modified versions
- *  of Qt that use the same license as Qt), and distribute linked
+ *  the TQt library by Trolltech AS, Norway (or with modified versions
+ *  of TQt that use the same license as TQt), and distribute linked
  *  combinations including the two.  You must obey the GNU General
  *  Public License in all respects for all of the code used other than
- *  Qt.  If you modify this file, you may extend this exception to
+ *  TQt.  If you modify this file, you may extend this exception to
  *  your version of the file, but you are not obligated to do so.  If
  *  you do not wish to do so, delete this exception statement from
  *  your version.
@@ -50,8 +50,8 @@
 
 using namespace KMail;
 
-KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name )
-  : FolderDiaTab( parent, name ),
+KMail::FolderDiaQuotaTab::FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* tqparent, const char* name )
+  : FolderDiaTab( tqparent, name ),
     mImapAccount( 0 ),
     mDlg( dlg )
 {
@@ -92,9 +92,9 @@ void KMail::FolderDiaQuotaTab::load()
   if ( mDlg->folder() ) {
     // existing folder
     initializeWithValuesFromFolder( mDlg->folder() );
-  } else if ( mDlg->parentFolder() ) {
+  } else if ( mDlg->tqparentFolder() ) {
     // new folder
-    initializeWithValuesFromFolder( mDlg->parentFolder() );
+    initializeWithValuesFromFolder( mDlg->tqparentFolder() );
   }
 
   if ( mFolderType == KMFolderTypeCachedImap ) {
@@ -114,18 +114,18 @@ void KMail::FolderDiaQuotaTab::load()
     mLabel->setText( i18n( "Error: no IMAP account defined for this folder" ) );
     return;
   }
-  KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
+  KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
   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..." ).arg( mImapAccount->host() ) );
   ImapAccountBase::ConnectionState state = mImapAccount->makeConnection();
   if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start
-    slotConnectionResult( -1, TQString::null );
+    slotConnectionResult( -1, TQString() );
   } else if ( state == ImapAccountBase::Connecting ) {
     connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ),
              this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) );
   } else { // Connected
-    slotConnectionResult( 0, TQString::null );
+    slotConnectionResult( 0, TQString() );
   }
 
 }
@@ -144,7 +144,7 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri
   }
   connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ),
           this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& ) ) );
-  KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder();
+  KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder();
   mImapAccount->getStorageQuotaInfo( folder, mImapPath );
 }
 
@@ -152,7 +152,7 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder,
                                                       KIO::Job* job,
                                                       const KMail::QuotaInfo& info )
 {
-  if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) {
+  if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->tqparentFolder() ) {
     //KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() );
 
     disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, KIO::Job*, const KMail::QuotaInfo& )),
@@ -187,7 +187,7 @@ void KMail::FolderDiaQuotaTab::showQuotaWidget()
 }
 
 
-KMail::FolderDiaTab::AccepStatus KMail::FolderDiaQuotaTab::accept()
+KMail::FolderDiaTab::AcceptqStatus KMail::FolderDiaQuotaTab::accept()
 {
   if ( mFolderType == KMFolderTypeCachedImap || mFolderType == KMFolderTypeImap )
     return Accepted;