diff options
Diffstat (limited to 'kmail/kmfoldercachedimap.cpp')
-rw-r--r-- | kmail/kmfoldercachedimap.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index d23a6ea5c..10dfff5af 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -102,10 +102,10 @@ static KMFolderCachedImap::IncidencesFor incidencesForFromString( const TQString return KMFolderCachedImap::IncForAdmins; // by default } -DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* tqparent, +DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* parent, const char* name ) : KDialogBase( Plain, i18n( "Troubleshooting IMAP Cache" ), - Ok | Cancel, Cancel, tqparent, name, true ), + Ok | Cancel, Cancel, parent, name, true ), rc( None ) { TQFrame* page = plainPage(); @@ -239,13 +239,13 @@ void KMFolderCachedImap::reallyDoClose( const char* owner ) KMFolderMaildir::reallyDoClose( owner ); } -void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* tqparent ) +void KMFolderCachedImap::initializeFrom( KMFolderCachedImap* parent ) { - setAccount( tqparent->account() ); + setAccount( parent->account() ); // Now that we have an account, tell it that this folder was created: // if this folder was just removed, then we don't really want to remove it from the server. mAccount->removeDeletedFolder( imapPath() ); - setUserRights( tqparent->userRights(), tqparent->userRightsState() ); + setUserRights( parent->userRights(), parent->userRightsState() ); } void KMFolderCachedImap::readConfig() @@ -2264,11 +2264,11 @@ void KMFolderCachedImap::listDirectory2() } if ( root && !mSubfolderNames.isEmpty() ) { - KMFolderCachedImap* tqparent = + KMFolderCachedImap* parent = findParent( mSubfolderPaths.first(), mSubfolderNames.first() ); - if ( tqparent ) { + if ( parent ) { kdDebug(5006) << "KMFolderCachedImap::listDirectory2 - pass listing to " - << tqparent->label() << endl; + << parent->label() << endl; mSubfolderNames.clear(); } } @@ -2392,18 +2392,18 @@ void KMFolderCachedImap::createFoldersNewOnServerAndFinishListing( const TQValue KMFolderCachedImap* KMFolderCachedImap::findParent( const TQString& path, const TQString& name ) { - TQString tqparent = path.left( path.length() - name.length() - 2 ); - if ( tqparent.length() > 1 ) + TQString parent = path.left( path.length() - name.length() - 2 ); + if ( parent.length() > 1 ) { - // extract name of the tqparent - tqparent = tqparent.right( tqparent.length() - 1 ); - if ( tqparent != label() ) + // extract name of the parent + parent = parent.right( parent.length() - 1 ); + if ( parent != label() ) { KMFolderNode *node = folder()->child()->first(); - // look for a better tqparent + // look for a better parent while ( node ) { - if ( node->name() == tqparent ) + if ( node->name() == parent ) { KMFolder* fld = static_cast<KMFolder*>(node); KMFolderCachedImap* imapFld = @@ -2555,7 +2555,7 @@ KMFolderCachedImap::slotMultiSetACLResult(KIO::Job *job) { KMAcctCachedImap::JobIterator it = mAccount->findJob(job); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - if ( (*it).tqparent != folder() ) return; // Shouldn't happen + if ( (*it).parent != folder() ) return; // Shouldn't happen if ( job->error() ) // Display error but don't abort the sync just for this @@ -2742,13 +2742,13 @@ void KMFolderCachedImap::slotAnnotationResult(const TQString& entry, const TQStr if ( contentsType != ContentsTypeMail ) kmkernel->iCalIface().setStorageFormat( folder(), KMailICalIfaceImpl::StorageXML ); mAnnotationFolderType = value; - if ( folder()->tqparent()->owner()->idString() != GlobalSettings::self()->theIMAPResourceFolderParent() + if ( folder()->parent()->owner()->idString() != GlobalSettings::self()->theIMAPResourceFolderParent() && GlobalSettings::self()->theIMAPResourceEnabled() && subtype == "default" ) { // Truncate subtype if this folder can't be a default resource folder for us, // although it apparently is for someone else. mAnnotationFolderType = type; - kdDebug(5006) << mImapPath << ": slotGetAnnotationResult: tqparent folder is " << folder()->tqparent()->owner()->idString() << " => truncating annotation to " << value << endl; + kdDebug(5006) << mImapPath << ": slotGetAnnotationResult: parent folder is " << folder()->parent()->owner()->idString() << " => truncating annotation to " << value << endl; } setContentsType( contentsType ); mAnnotationFolderTypeChanged = false; // we changed it, not the user @@ -2800,8 +2800,8 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job ) KMAcctCachedImap::JobIterator it = mAccount->findJob(job); Q_ASSERT( it != mAccount->jobsEnd() ); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - Q_ASSERT( (*it).tqparent == folder() ); - if ( (*it).tqparent != folder() ) return; // Shouldn't happen + Q_ASSERT( (*it).parent == folder() ); + if ( (*it).parent != folder() ) return; // Shouldn't happen AnnotationJobs::GetAnnotationJob* annjob = static_cast<AnnotationJobs::GetAnnotationJob *>( job ); if ( annjob->error() ) { @@ -2826,8 +2826,8 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job ) KMAcctCachedImap::JobIterator it = mAccount->findJob(job); Q_ASSERT( it != mAccount->jobsEnd() ); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - Q_ASSERT( (*it).tqparent == folder() ); - if ( (*it).tqparent != folder() ) return; // Shouldn't happen + Q_ASSERT( (*it).parent == folder() ); + if ( (*it).parent != folder() ) return; // Shouldn't happen TQValueVector<int> folders; AnnotationJobs::MultiUrlGetAnnotationJob* annjob @@ -2878,8 +2878,8 @@ void KMFolderCachedImap::slotQuotaResult( KIO::Job* job ) KMAcctCachedImap::JobIterator it = mAccount->findJob(job); Q_ASSERT( it != mAccount->jobsEnd() ); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - Q_ASSERT( (*it).tqparent == folder() ); - if ( (*it).tqparent != folder() ) return; // Shouldn't happen + Q_ASSERT( (*it).parent == folder() ); + if ( (*it).parent != folder() ) return; // Shouldn't happen QuotaJobs::GetStorageQuotaJob* quotajob = static_cast<QuotaJobs::GetStorageQuotaJob *>( job ); QuotaInfo empty; @@ -2921,8 +2921,8 @@ void KMFolderCachedImap::slotTestAnnotationResult(KIO::Job *job) KMAcctCachedImap::JobIterator it = mAccount->findJob(job); Q_ASSERT( it != mAccount->jobsEnd() ); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - Q_ASSERT( (*it).tqparent == folder() ); - if ( (*it).tqparent != folder() ) return; // Shouldn't happen + Q_ASSERT( (*it).parent == folder() ); + if ( (*it).parent != folder() ) return; // Shouldn't happen mAccount->setAnnotationCheckPassed( true ); if ( job->error() ) { @@ -2940,7 +2940,7 @@ KMFolderCachedImap::slotSetAnnotationResult(KIO::Job *job) { KMAcctCachedImap::JobIterator it = mAccount->findJob(job); if ( it == mAccount->jobsEnd() ) return; // Shouldn't happen - if ( (*it).tqparent != folder() ) return; // Shouldn't happen + if ( (*it).parent != folder() ) return; // Shouldn't happen bool cont = true; if ( job->error() ) { |