From 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:50:21 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kmail/kmailicalifaceimpl.cpp | 86 ++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'kmail/kmailicalifaceimpl.cpp') diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index 1376932e0..a27bf2a66 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -63,7 +63,7 @@ using KMail::AccountManager; #include #include -#include +#include #include #include @@ -671,19 +671,19 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder ) } TQString label = folder->prettyURL(); - TQStringList parts = TQStringList::split( TQString::tqfromLatin1("/"), label ); + TQStringList parts = TQStringList::split( TQString::fromLatin1("/"), label ); // In the common special case of some other user's folder shared with us // the url looks like "Server Name/user/$USERNAME/Folder/Name". Make // those a bit nicer. - if ( parts[1] == TQString::tqfromLatin1("user") ) { + if ( parts[1] == TQString::fromLatin1("user") ) { TQStringList remainder(parts); remainder.pop_front(); remainder.pop_front(); remainder.pop_front(); label = i18n("%1's %2") - .tqarg( parts[2] ) - .tqarg( remainder.join( TQString::tqfromLatin1("/") ) ); + .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::tqfromLatin1("/") ), + .arg( remainder.join( TQString::fromLatin1("/") ), static_cast( folder->storage() )->account()->name() ); } else { label = i18n("My %1") - .tqarg( remainder.join( TQString::tqfromLatin1("/") ) ); + .arg( remainder.join( TQString::fromLatin1("/") ) ); } } else { label = i18n("My %1") - .tqarg( remainder.join( TQString::tqfromLatin1("/") ) ); + .arg( remainder.join( TQString::fromLatin1("/") ) ); } break; } @@ -1311,33 +1311,33 @@ TQString KMailICalIfaceImpl::folderName( KFolderTreeItem::Type type, int languag GroupwarePage in configuredialog.cpp */ // English - folderNames[0][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendar"); - folderNames[0][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Tasks"); - folderNames[0][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal"); - folderNames[0][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts"); - folderNames[0][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes"); + folderNames[0][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendar"); + folderNames[0][KFolderTreeItem::Tasks] = TQString::fromLatin1("Tasks"); + folderNames[0][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal"); + folderNames[0][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts"); + folderNames[0][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes"); // German - folderNames[1][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Kalender"); - folderNames[1][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Aufgaben"); - folderNames[1][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal"); - folderNames[1][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Kontakte"); - folderNames[1][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notizen"); + folderNames[1][KFolderTreeItem::Calendar] = TQString::fromLatin1("Kalender"); + folderNames[1][KFolderTreeItem::Tasks] = TQString::fromLatin1("Aufgaben"); + folderNames[1][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal"); + folderNames[1][KFolderTreeItem::Contacts] = TQString::fromLatin1("Kontakte"); + folderNames[1][KFolderTreeItem::Notes] = TQString::fromLatin1("Notizen"); // French - folderNames[2][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendrier"); + folderNames[2][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendrier"); // Tasks = Tâches (â == 0xE2 in latin1) - folderNames[2][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("T\342ches"); - folderNames[2][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal"); - folderNames[2][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts"); - folderNames[2][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes"); + folderNames[2][KFolderTreeItem::Tasks] = TQString::fromLatin1("T\342ches"); + folderNames[2][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal"); + folderNames[2][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts"); + folderNames[2][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes"); // Dutch - folderNames[3][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Agenda"); - folderNames[3][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Taken"); - folderNames[3][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Logboek"); - folderNames[3][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contactpersonen"); - folderNames[3][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notities"); + folderNames[3][KFolderTreeItem::Calendar] = TQString::fromLatin1("Agenda"); + folderNames[3][KFolderTreeItem::Tasks] = TQString::fromLatin1("Taken"); + folderNames[3][KFolderTreeItem::Journals] = TQString::fromLatin1("Logboek"); + folderNames[3][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contactpersonen"); + folderNames[3][KFolderTreeItem::Notes] = TQString::fromLatin1("Notities"); } if( language < 0 || language > 3 ) { @@ -1574,7 +1574,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL ) kdWarning() << "KCal::ResourceKolab::fromKMailFolderSynced path is too short: " << path << endl; return; } - if ( path.tqstartsWith( "/INBOX/", false ) ) { + if ( path.startsWith( "/INBOX/", false ) ) { // If INBOX, replace it with the username (which is user@domain) path = path.mid( secondSlash ); path.prepend( folderURL.user() ); @@ -1717,9 +1717,9 @@ void KMailICalIfaceImpl::readConfig() Q_ASSERT( account ); if ( account ) { // just in case we were connected already - disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), + disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), this, TQT_SLOT( slotCheckDone() ) ); - connect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), + connect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), this, TQT_SLOT( slotCheckDone() ) ); } mUseResourceIMAP = false; @@ -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); } @@ -1966,7 +1966,7 @@ void KMailICalIfaceImpl::slotCheckDone() { KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() ); if ( account ) - disconnect( account, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ), + disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), this, TQT_SLOT( slotCheckDone() ) ); readConfig(); } @@ -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 ); @@ -2139,15 +2139,15 @@ TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const return TQString(); if( type == KFolderTreeItem::Contacts ) - return TQString::tqfromLatin1( "kmgroupware_folder_contacts" ); + return TQString::fromLatin1( "kmgroupware_folder_contacts" ); else if( type == KFolderTreeItem::Calendar ) - return TQString::tqfromLatin1( "kmgroupware_folder_calendar" ); + return TQString::fromLatin1( "kmgroupware_folder_calendar" ); else if( type == KFolderTreeItem::Notes ) - return TQString::tqfromLatin1( "kmgroupware_folder_notes" ); + return TQString::fromLatin1( "kmgroupware_folder_notes" ); else if( type == KFolderTreeItem::Tasks ) - return TQString::tqfromLatin1( "kmgroupware_folder_tasks" ); + return TQString::fromLatin1( "kmgroupware_folder_tasks" ); else if( type == KFolderTreeItem::Journals ) - return TQString::tqfromLatin1( "kmgroupware_folder_journals" ); + return TQString::fromLatin1( "kmgroupware_folder_journals" ); return TQString(); } -- cgit v1.2.1