From 716a5de8870d7c02bb4d0aed72f30291b17b763a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:01 -0600 Subject: Remove additional unneeded tq method conversions --- kmail/kmfoldercachedimap.cpp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'kmail/kmfoldercachedimap.cpp') diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index a55d22561..02bec8ed0 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -215,7 +215,7 @@ KMFolderCachedImap::KMFolderCachedImap( KMFolder* folder, const char* aName ) KMessageBox::error( 0, i18n( "The UID cache file for folder %1 could not be read. There " "could be a problem with file system permission, or it is corrupted." - ).tqarg( folder->prettyURL() ) ); + ).arg( folder->prettyURL() ) ); // try to unlink it, in case it was corruped. If it couldn't be read // because of permissions, this will fail, which is fine unlink( TQFile::encodeName( uidCacheLocation() ) ); @@ -486,7 +486,7 @@ int KMFolderCachedImap::writeUidCache() } KMessageBox::error( 0, i18n( "The UID cache file for folder %1 could not be written. There " - "could be a problem with file system permission." ).tqarg( folder()->prettyURL() ) ); + "could be a problem with file system permission." ).arg( folder()->prettyURL() ) ); return -1; } @@ -739,7 +739,7 @@ void KMFolderCachedImap::slotTroubleshoot() TQString str = i18n("Are you sure you want to refresh the IMAP cache of " "the folder %1 and all its subfolders?\nThis will " "remove all changes you have done locally to your " - "folders.").tqarg( label() ); + "folders.").arg( label() ); TQString s1 = i18n("Refresh IMAP Cache"); TQString s2 = i18n("&Refresh"); if( KMessageBox::warningContinueCancel( 0, str, s1, s2 ) == @@ -774,7 +774,7 @@ void KMFolderCachedImap::slotTroubleshoot() void KMFolderCachedImap::serverSync( bool recurse, bool quotaOnly ) { if( mSyncState != SYNC_STATE_INITIAL ) { - if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).tqarg( imapPath() ).tqarg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) { + if( KMessageBox::warningYesNo( 0, i18n("Folder %1 is not in initial sync state (state was %2). Do you want to reset it to initial sync state and sync anyway?" ).arg( imapPath() ).arg( mSyncState ), TQString(), i18n("Reset && Sync"), KStdGuiItem::cancel() ) == KMessageBox::Yes ) { mSyncState = SYNC_STATE_INITIAL; } else return; } @@ -899,14 +899,14 @@ void KMFolderCachedImap::serverSyncInternal() // Cancelled by user, or slave can't start // kdDebug(5006) << "makeConnection said Error, aborting." << endl; // We stop here. We're already in SYNC_STATE_INITIAL for the next time. - newState( mProgress, i18n( "Error connecting to server %1" ).tqarg( mAccount->host() ) ); + newState( mProgress, i18n( "Error connecting to server %1" ).arg( mAccount->host() ) ); close("cachedimap"); emit folderComplete(this, false); break; } else if ( cs == ImapAccountBase::Connecting ) { mAccount->setAnnotationCheckPassed( false ); // kdDebug(5006) << "makeConnection said Connecting, waiting for signal." << endl; - newState( mProgress, i18n("Connecting to %1").tqarg( mAccount->host() ) ); + newState( mProgress, i18n("Connecting to %1").arg( mAccount->host() ) ); // We'll wait for the connectionResult signal from the account. connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); @@ -1478,7 +1478,7 @@ void KMFolderCachedImap::uploadNewMessages() && !(mUserRights & KMail::ACLJobs::Insert) ) { // write access revoked KMessageBox::information( 0, i18n("

Your access rights to folder %1 have been restricted, " - "it will no longer be possible to add messages to this folder.

").tqarg( folder()->prettyURL() ), + "it will no longer be possible to add messages to this folder.

").arg( folder()->prettyURL() ), i18n("Acces rights revoked"), "KMailACLRevocationNotification" ); } } @@ -1618,18 +1618,18 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString& } // This is not perfect, what if the status didn't really change? Oh well ... -void KMFolderCachedImap::seStatus( int idx, KMMsgStatus status, bool toggle) +void KMFolderCachedImap::setStatus( int idx, KMMsgStatus status, bool toggle) { - KMFolderMaildir::seStatus( idx, status, toggle ); + KMFolderMaildir::setStatus( idx, status, toggle ); const KMMsgBase *msg = getMsgBase( idx ); Q_ASSERT( msg ); if ( msg ) mUIDsOfLocallyChangedStatuses.insert( msg->UID() ); } -void KMFolderCachedImap::seStatus(TQValueList& ids, KMMsgStatus status, bool toggle) +void KMFolderCachedImap::setStatus(TQValueList& ids, KMMsgStatus status, bool toggle) { - KMFolderMaildir::seStatus(ids, status, toggle); + KMFolderMaildir::setStatus(ids, status, toggle); for (TQValueList::iterator it = ids.begin(); it != ids.end(); it++ ) { const KMMsgBase *msg = getMsgBase( *it ); Q_ASSERT( msg ); @@ -1706,7 +1706,7 @@ bool KMFolderCachedImap::deleteMessages() if ( KMessageBox::warningYesNo( 0, i18n( "

Mails on the server in folder %1 were deleted. " "Do you want to delete them locally?
UIDs: %2

" ) - .tqarg( folder()->prettyURL() ).tqarg( uids.join(",") ) ) == KMessageBox::Yes ) + .arg( folder()->prettyURL() ).arg( uids.join(",") ) ) == KMessageBox::Yes ) #endif removeMsg( msgsForDeletion ); } @@ -2055,7 +2055,7 @@ void KMFolderCachedImap::listNamespaces() mNamespacesToList.pop_front(); mSyncState = SYNC_STATE_LIST_SUBFOLDERS2; - newState( mProgress, i18n("Retrieving folders for namespace %1").tqarg(ns)); + newState( mProgress, i18n("Retrieving folders for namespace %1").arg(ns)); KMail::ListJob* job = new KMail::ListJob( mAccount, type, this, mAccount->addPathToNamespace( ns ) ); job->setNamespace( ns ); @@ -2297,7 +2297,7 @@ void KMFolderCachedImap::listDirectory2() // (could be that the folder was deleted & recreated meanwhile from another client...) if ( !locallyDeleted && mAccount->isPreviouslyDeletedFolder( subfolderPath ) ) { locallyDeleted = KMessageBox::warningYesNo( - 0, i18n( "

It seems that the folder %1 was deleted. Do you want to delete it from the server?

" ).tqarg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes; + 0, i18n( "

It seems that the folder %1 was deleted. Do you want to delete it from the server?

" ).arg( mSubfolderNames[i] ), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel() ) == KMessageBox::Yes; } if ( locallyDeleted ) { @@ -2596,7 +2596,7 @@ void KMFolderCachedImap::resetSyncState() KPIM::ProgressItem *progressItem = mAccount->mailCheckProgressItem(); TQString str = i18n("Aborted"); if (progressItem) - progressItem->seStatus( str ); + progressItem->setStatus( str ); emit statusMsg( str ); emit syncStateChanged(); } @@ -2618,9 +2618,9 @@ void KMFolderCachedImap::newState( int progress, const TQString& syncStatus ) if ( mAccount->imapFolder() == this ) str = syncStatus; else - str = TQString( "%1: %2" ).tqarg( label() ).tqarg( syncStatus ); + str = TQString( "%1: %2" ).arg( label() ).arg( syncStatus ); if( progressItem ) - progressItem->seStatus( str ); + progressItem->setStatus( str ); emit statusMsg( str ); } if( progressItem ) @@ -2809,7 +2809,7 @@ void KMFolderCachedImap::slotGetAnnotationResult( KIO::Job* job ) // that's when the imap server doesn't support annotations if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() ) - KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).tqarg( mAccount->host() ) ); + KMessageBox::error( 0, i18n( "The IMAP server %1 does not have support for IMAP annotations. The XML storage cannot be used on this server; please re-configure KMail differently." ).arg( mAccount->host() ) ); mAccount->setHasNoAnnotationSupport(); } else @@ -2837,7 +2837,7 @@ void KMFolderCachedImap::slotMultiUrlGetAnnotationResult( KIO::Job* job ) // that's when the imap server doesn't support annotations if ( GlobalSettings::self()->theIMAPResourceStorageFormat() == GlobalSettings::EnumTheIMAPResourceStorageFormat::XML && (uint)GlobalSettings::self()->theIMAPResourceAccount() == mAccount->id() ) - KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).tqarg( mAccount->host() ) ); + KMessageBox::error( 0, i18n( "The IMAP server %1 doesn't have support for imap annotations. The XML storage cannot be used on this server, please re-configure KMail differently" ).arg( mAccount->host() ) ); mAccount->setHasNoAnnotationSupport(); } else @@ -3063,7 +3063,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() bool manualMove = true; while ( GlobalSettings::autoLostFoundMove() ) { // find the inbox of this account - KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").tqarg( account()->id() ) ); + KMFolder *inboxFolder = kmkernel->findFolderById( TQString(".%1.directory/INBOX").arg( account()->id() ) ); if ( !inboxFolder ) { kdWarning(5006) << k_funcinfo << "inbox not found!" << endl; break; @@ -3119,7 +3119,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() "on the server or you do not " "have sufficient access rights on the folder to upload them.

" "

All affected messages will therefore be moved to %2 " - "to avoid data loss.

").tqarg( folder()->prettyURL() ).tqarg( dest->prettyURL() ), + "to avoid data loss.

").arg( folder()->prettyURL() ).arg( dest->prettyURL() ), i18n("Insufficient access rights") ); manualMove = false; break; @@ -3132,7 +3132,7 @@ KMCommand* KMFolderCachedImap::rescueUnsyncedMessages() "have sufficient access rights on the folder now to upload them. " "Please contact your administrator to allow upload of new messages " "to you, or move them out of this folder.

" - "

Do you want to move these messages to another folder now?

").tqarg( folder()->prettyURL() ) ); + "

Do you want to move these messages to another folder now?

").arg( folder()->prettyURL() ) ); if ( KMessageBox::warningYesNo( 0, msg, TQString(), i18n("Move"), i18n("Do Not Move") ) == KMessageBox::Yes ) { KMail::KMFolderSelDlg dlg( kmkernel->getKMMainWidget(), i18n("Move Messages to Folder"), true ); -- cgit v1.2.1