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/kmkernel.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'kmail/kmkernel.cpp') diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index a7624d844..ef6ee4f73 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -947,7 +947,7 @@ int KMKernel::dcopAddMessage( const TQString & foldername,const KURL & msgUrl, if ( !MsgStatusFlags.isEmpty() ) { KMMsgStatus status = strToStatus(MsgStatusFlags); - if (status) msg->seStatus(status); + if (status) msg->setStatus(status); } int index; @@ -1060,7 +1060,7 @@ int KMKernel::dcopAddMessage_fastImport( const TQString & foldername, if( !MsgStatusFlags.isEmpty() ) { KMMsgStatus status = strToStatus(MsgStatusFlags); - if (status) msg->seStatus(status); + if (status) msg->setStatus(status); } if ( mAddMsgCurrentFolder->addMsg( msg, &index ) == 0 ) { @@ -1211,9 +1211,9 @@ TQString KMKernel::debugSernum( TQ_UINT32 serialNumber ) msg = folder->getMsgBase( idx ); if (msg) { res.append( TQString( " subject %s,\n sender %s,\n date %s.\n" ) - .tqarg( msg->subject() ) - .tqarg( msg->fromStrip() ) - .tqarg( msg->dateStr() ) ); + .arg( msg->subject() ) + .arg( msg->fromStrip() ) + .arg( msg->dateStr() ) ); } else { res.append( TQString( "Invalid serial number." ) ); } @@ -1243,7 +1243,7 @@ void KMKernel::stopNetworkJobs() return; GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Offline ); - BroadcastStatus::instance()->seStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended")); + BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended")); emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() ); } @@ -1253,7 +1253,7 @@ void KMKernel::resumeNetworkJobs() return; GlobalSettings::setNetworkState( GlobalSettings::EnumNetworkState::Online ); - BroadcastStatus::instance()->seStatusMsg( i18n("KMail is set to be online; all network jobs resumed")); + BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be online; all network jobs resumed")); emit onlineStatusChanged( (GlobalSettings::EnumNetworkState::type)GlobalSettings::networkState() ); if ( kmkernel->msgSender()->sendImmediate() ) { @@ -1360,7 +1360,7 @@ void KMKernel::testDir(const char *_name) KMessageBox::sorry(0, i18n("KMail could not create folder '%1';\n" "please make sure that you can view and " "modify the content of the folder '%2'.") - .tqarg( foldersPath ).tqarg( TQDir::homeDirPath() ) ); + .arg( foldersPath ).arg( TQDir::homeDirPath() ) ); ::exit(-1); } } @@ -1369,7 +1369,7 @@ void KMKernel::testDir(const char *_name) "incorrect;\n" "please make sure that you can view and modify " "the content of this folder.") - .tqarg( foldersPath ) ); + .arg( foldersPath ) ); ::exit(-1); } } @@ -1673,7 +1673,7 @@ void KMKernel::cleanupImapFolders() cfld = static_cast(the_dimapFolderMgr->createFolder(TQString::number(acct->id()), false, KMFolderTypeCachedImap)->storage()); if (!cfld) { - KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").tqarg(acct->name()).tqarg(the_dimapFolderMgr->basePath()))); + KMessageBox::error(0,(i18n("Cannot create file `%1' in %2.\nKMail cannot start without it.").arg(acct->name()).arg(the_dimapFolderMgr->basePath()))); exit(-1); } cfld->folder()->setId( acct->id() ); @@ -1884,8 +1884,8 @@ bool KMKernel::transferMail( TQString & destinationDir ) "the same name in %7.

" "Would you like %3 to move the mail " "files now?" ) - .tqarg( kmailName, kmailName, kmailName ) - .tqarg( dir, destinationDir, dir, destinationDir ); + .arg( kmailName, kmailName, kmailName ) + .arg( dir, destinationDir, dir, destinationDir ); } else { msg = i18n( "%1-%3 is the application name, %4-%6 are folder path", "The %4 folder exists. " @@ -1894,8 +1894,8 @@ bool KMKernel::transferMail( TQString & destinationDir ) "this folder for you.

" "Would you like %3 to move the mail " "files now?" ) - .tqarg( kmailName, kmailName, kmailName ) - .tqarg( dir, destinationDir, dir ); + .arg( kmailName, kmailName, kmailName ) + .arg( dir, destinationDir, dir ); } TQString title = i18n( "Migrate Mail Files?" ); TQString buttonText = i18n( "Move" ); @@ -2047,7 +2047,7 @@ void KMKernel::slotResult(KIO::Job *job) { if (KMessageBox::warningContinueCancel(0, i18n("File %1 exists.\nDo you want to replace it?") - .tqarg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace")) + .arg((*it).url.prettyURL()), i18n("Save to File"), i18n("&Replace")) == KMessageBox::Continue) byteArrayToRemoteFile((*it).data, (*it).url, true); } @@ -2135,7 +2135,7 @@ void KMKernel::emergencyExit( const TQString& reason ) mesg = i18n("KMail encountered a fatal error and will terminate now"); } else { mesg = i18n("KMail encountered a fatal error and will " - "terminate now.\nThe error was:\n%1").tqarg( reason ); + "terminate now.\nThe error was:\n%1").arg( reason ); } kdWarning() << mesg << endl; -- cgit v1.2.1