diff options
Diffstat (limited to 'kmail/cachedimapjob.cpp')
| -rw-r--r-- | kmail/cachedimapjob.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index d13382511..6dcae58c1 100644 --- a/kmail/cachedimapjob.cpp +++ b/kmail/cachedimapjob.cpp @@ -534,8 +534,8 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) } // make copy of setting, to reset it before potentially destroying 'it' - bool silentUpload = static_cast<KMFolderCachedImap*>((*it).tqparent->storage())->silentUpload(); - static_cast<KMFolderCachedImap*>((*it).tqparent->storage())->setSilentUpload( false ); + bool silentUpload = static_cast<KMFolderCachedImap*>((*it).parent->storage())->silentUpload(); + static_cast<KMFolderCachedImap*>((*it).parent->storage())->setSilentUpload( false ); if ( job->error() && !silentUpload ) { TQString myError = "<p><b>" + i18n("Error while uploading folder") @@ -549,7 +549,7 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) return; } else { KMFolderCachedImap* storage = static_cast<KMFolderCachedImap*>( (*it).current->storage() ); - KMFolderCachedImap* parentStorage = static_cast<KMFolderCachedImap*>( (*it).tqparent->storage() ); + KMFolderCachedImap* parentStorage = static_cast<KMFolderCachedImap*>( (*it).parent->storage() ); Q_ASSERT( storage ); Q_ASSERT( parentStorage ); if ( storage->imapPath().isEmpty() ) { @@ -581,9 +581,9 @@ void CachedImapJob::slotAddNextSubfolder( KIO::Job * job ) url.setPath( path ); if ( mAccount->groupwareType() != KMAcctCachedImap::GroupwareScalix ) { - // Associate the jobData with the tqparent folder, not with the child + // Associate the jobData with the parent folder, not with the child // This is necessary in case of an error while creating the subfolder, - // so that folderComplete is called on the tqparent (and the sync resetted). + // so that folderComplete is called on the parent (and the sync resetted). ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); jd.items << folder->label(); // for the err msg jd.current = folder->folder(); @@ -679,7 +679,7 @@ void CachedImapJob::slotCheckUidValidityResult(KIO::Job * job) if( job->error() ) { mErrorCode = job->error(); - mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).tqarg( (*it).tqparent->label() ) + '\n' ); + mAccount->handleJobError( job, i18n( "Error while reading folder %1 on the server: " ).tqarg( (*it).parent->label() ) + '\n' ); delete this; return; } @@ -892,9 +892,9 @@ void CachedImapJob::slotListMessagesResult( KIO::Job * job ) } //----------------------------------------------------------------------------- -void CachedImapJob::setParentFolder( const KMFolderCachedImap* tqparent ) +void CachedImapJob::setParentFolder( const KMFolderCachedImap* parent ) { - mParentFolder = const_cast<KMFolderCachedImap*>( tqparent ); + mParentFolder = const_cast<KMFolderCachedImap*>( parent ); } } |