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/kmailicalifaceimpl.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kmail/kmailicalifaceimpl.cpp') diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index 45654d276..abf480c99 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -682,8 +682,8 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder ) remainder.pop_front(); remainder.pop_front(); label = i18n("%1's %2") - .tqarg( parts[2] ) - .tqarg( remainder.join( TQString::fromLatin1("/") ) ); + .arg( parts[2] ) + .arg( remainder.join( TQString::fromLatin1("/") ) ); } // Another special case is our own folders, under the imap INBOX, make // those prettier too @@ -698,15 +698,15 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder ) // Fix kolab issue 2531 folder->storage() )->account() can be null if( folder->storage() && static_cast( folder->storage() )->account() ) { label = i18n( "My %1 (%2)") - .tqarg( remainder.join( TQString::fromLatin1("/") ), + .arg( remainder.join( TQString::fromLatin1("/") ), static_cast( folder->storage() )->account()->name() ); } else { label = i18n("My %1") - .tqarg( remainder.join( TQString::fromLatin1("/") ) ); + .arg( remainder.join( TQString::fromLatin1("/") ) ); } } else { label = i18n("My %1") - .tqarg( remainder.join( TQString::fromLatin1("/") ) ); + .arg( remainder.join( TQString::fromLatin1("/") ) ); } break; } @@ -1776,7 +1776,7 @@ void KMailICalIfaceImpl::readConfig() // No subfolder was found, so ask if we can make them msg = i18n("KMail will now create the required groupware folders" " as subfolders of %1; if you do not want this, cancel" - " and the IMAP resource will be disabled").tqarg(parentFolderName); + " and the IMAP resource will be disabled").arg(parentFolderName); } else { // Some subfolders were found, be more precise TQString operations = "
    "; @@ -1784,17 +1784,17 @@ void KMailICalIfaceImpl::readConfig() if ( i != KMail::ContentsTypeMail ) { TQString typeName = localizedDefaultFolderName( static_cast( i ) ); if ( results[i].found == StandardFolderSearchResult::NotFound ) - operations += "
  • " + i18n( "%1: no folder found. It will be created." ).tqarg( typeName ) + "
  • "; + operations += "
  • " + i18n( "%1: no folder found. It will be created." ).arg( typeName ) + "
  • "; else if ( results[i].found == StandardFolderSearchResult::FoundByType || results[i].found == StandardFolderSearchResult::FoundByName ) operations += "
  • " + i18n( "%1: found folder %2. It will be set as the main groupware folder." ). - tqarg( typeName ).tqarg( results[i].folder->label() ) + "
  • "; + arg( typeName ).arg( results[i].folder->label() ) + ""; } } operations += "
"; msg = i18n("KMail found the following groupware folders in %1 and needs to perform the following operations: %2" "
If you do not want this, cancel" - " and the IMAP resource will be disabled").tqarg(parentFolderName, operations); + " and the IMAP resource will be disabled").arg(parentFolderName, operations); } @@ -1991,7 +1991,7 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType labels << (*it)->prettyURL(); const TQString selected = KInputDialog::getItem( i18n("Default folder"), i18n("There are multiple %1 default folders, please choose one:") - .tqarg( localizedDefaultFolderName( contentsType ) ), labels ); + .arg( localizedDefaultFolderName( contentsType ) ), labels ); if ( !selected.isEmpty() ) result.folder = result.folders[ labels.findIndex( selected ) ]; } @@ -2017,7 +2017,7 @@ KMFolder* KMailICalIfaceImpl::initFolder( KMail::FolderContentsType contentsType if( folder->canAccess() != 0 ) { KMessageBox::sorry(0, i18n("You do not have read/write permission to your %1 folder.") - .tqarg( folderName( itemType ) ) ); + .arg( folderName( itemType ) ) ); return 0; } folder->storage()->setContentsType( contentsType ); -- cgit v1.2.1