diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:59:01 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:59:01 -0600 |
commit | 716a5de8870d7c02bb4d0aed72f30291b17b763a (patch) | |
tree | 29e58b213ead28151ccf7eb33d12c968ea844120 /kmail/kmcommands.cpp | |
parent | 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 (diff) | |
download | tdepim-716a5de8870d7c02bb4d0aed72f30291b17b763a.tar.gz tdepim-716a5de8870d7c02bb4d0aed72f30291b17b763a.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'kmail/kmcommands.cpp')
-rw-r--r-- | kmail/kmcommands.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 508964519..341a35208 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -595,14 +595,14 @@ KMCommand::Result KMUrlCopyCommand::execute() clip->setText( address ); clip->setSelectionMode( false ); clip->setText( address ); - KPIM::BroadcastStatus::instance()->seStatusMsg( i18n( "Address copied to clipboard." )); + KPIM::BroadcastStatus::instance()->setStatusMsg( i18n( "Address copied to clipboard." )); } else { // put the url into the mouse selection and the clipboard clip->setSelectionMode( true ); clip->setText( mUrl.url() ); clip->setSelectionMode( false ); clip->setText( mUrl.url() ); - KPIM::BroadcastStatus::instance()->seStatusMsg( i18n( "URL copied to clipboard." )); + KPIM::BroadcastStatus::instance()->setStatusMsg( i18n( "URL copied to clipboard." )); } return OK; @@ -640,7 +640,7 @@ KMCommand::Result KMUrlSaveCommand::execute() { if (KMessageBox::warningContinueCancel(0, i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>") - .tqarg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) + .arg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) != KMessageBox::Continue) return Canceled; } @@ -753,8 +753,8 @@ KMCommand::Result KMShowMsgSrcCommand::execute() viewer->resize(TQApplication::desktop()->screenGeometry(scnum).width()/2, 2*TQApplication::desktop()->screenGeometry(scnum).height()/3); } else { - viewer->resize(TQApplication::desktop()->tqgeometry().width()/2, - 2*TQApplication::desktop()->tqgeometry().height()/3); + viewer->resize(TQApplication::desktop()->geometry().width()/2, + 2*TQApplication::desktop()->geometry().height()/3); } viewer->show(); @@ -963,7 +963,7 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job) { if (KMessageBox::warningContinueCancel(0, i18n("File %1 exists.\nDo you want to replace it?") - .tqarg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) + .arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace")) == KMessageBox::Continue) { mOffset = 0; @@ -1397,12 +1397,12 @@ KMCommand::Result KMForwardDigestCommand::execute() msgPartText += "--"; msgPartText += TQString::fromLatin1( boundary ); msgPartText += "\nContent-Type: MESSAGE/RFC822"; - msgPartText += TQString( "; CHARSET=%1" ).tqarg( TQString(msg->charset()) ); + msgPartText += TQString( "; CHARSET=%1" ).arg( TQString(msg->charset()) ); msgPartText += '\n'; DwHeaders dwh; dwh.MessageId().CreateDefault(); - msgPartText += TQString( "Content-ID: %1\n" ).tqarg( dwh.MessageId().AsString().c_str() ); - msgPartText += TQString( "Content-Description: %1" ).tqarg( msg->subject() ); + msgPartText += TQString( "Content-ID: %1\n" ).arg( dwh.MessageId().AsString().c_str() ); + msgPartText += TQString( "Content-Description: %1" ).arg( msg->subject() ); if ( !msg->subject().contains( "(fwd)" ) ) msgPartText += " (fwd)"; msgPartText += "\n\n"; @@ -1430,7 +1430,7 @@ KMCommand::Result KMForwardDigestCommand::execute() msgPart->setSubtypeStr( tmp ); msgPart->setName( "unnamed" ); msgPart->setCte( DwMime::kCte7bit ); // does it have to be 7bit? - msgPart->setContentDescription( TQString( "Digest of %1 messages." ).tqarg( msgCnt ) ); + msgPart->setContentDescription( TQString( "Digest of %1 messages." ).arg( msgCnt ) ); // THIS HAS TO BE AFTER setCte()!!!! msgPart->setBodyEncoded( TQCString( msgPartText.ascii() ) ); KCursorSaver busy( KBusyPtr::busy() ); @@ -1690,7 +1690,7 @@ KMCommand::Result KMSeStatusCommand::execute() TQMapIterator< KMFolder*, TQValueList<int> > it2 = folderMap.begin(); while ( it2 != folderMap.end() ) { KMFolder *f = it2.key(); - f->seStatus( (*it2), mStatus, mToggle ); + f->setStatus( (*it2), mStatus, mToggle ); ++it2; } //kapp->dcopClient()->emitDCOPSignal( "unreadCountChanged()", TQByteArray() ); @@ -1741,8 +1741,8 @@ KMCommand::Result KMFilterActionCommand::execute() if ( diff < 10 || !( msgCount % 20 ) || msgCount <= 10 ) { progressItem->updateProgress(); TQString statusMsg = i18n("Filtering message %1 of %2"); - statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter ); - KPIM::BroadcastStatus::instance()->seStatusMsg( statusMsg ); + statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter ); + KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg ); KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 ); } @@ -1995,7 +1995,7 @@ KMCommand::Result KMCopyCommand::execute() // corrupt IMAP cache, see FolderStorage::getMsg() if ( msg == 0 ) { KMessageBox::error( parentWidget(), i18n("Corrupt IMAP cache detected in folder %1. " - "Copying of messages aborted.").tqarg( srcFolder->prettyURL() ) ); + "Copying of messages aborted.").arg( srcFolder->prettyURL() ) ); deleteLater(); return Failed; } @@ -2015,7 +2015,7 @@ KMCommand::Result KMCopyCommand::execute() // make sure the attachment state is only calculated when it's complete if (!newMsg->isComplete()) newMsg->setReadyToShow(false); - newMsg->seStatus(msg->status()); + newMsg->setStatus(msg->status()); if (srcFolder && !newMsg->isComplete()) { @@ -2453,7 +2453,7 @@ KMCommand::Result KMUrlClickedCommand::execute() (mUrl.protocol() == "smb") || (mUrl.protocol() == "fish") || (mUrl.protocol() == "news")) { - KPIM::BroadcastStatus::instance()->seStatusMsg( i18n("Opening URL...")); + KPIM::BroadcastStatus::instance()->setStatusMsg( i18n("Opening URL...")); KMimeType::Ptr mime = KMimeType::findByURL( mUrl ); if (mime->name() == "application/x-desktop" || mime->name() == "application/x-executable" || @@ -2461,7 +2461,7 @@ KMCommand::Result KMUrlClickedCommand::execute() mime->name() == "application/x-shellscript" ) { if (KMessageBox::warningYesNo( 0, i18n( "<qt>Do you really want to execute <b>%1</b>?</qt>" ) - .tqarg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes) + .arg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes) return Canceled; } KRun * runner = new KRun( mUrl ); @@ -2605,7 +2605,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() ++unnamedAtmCount; s = i18n("filename for the %1-th unnamed attachment", "attachment.%1") - .tqarg( unnamedAtmCount ); + .arg( unnamedAtmCount ); } curUrl.setFileName( s ); } else { @@ -2644,7 +2644,7 @@ void KMSaveAttachmentsCommand::slotSaveAll() if ( KIO::NetAccess::exists( curUrl, false, parentWidget() ) ) { if ( KMessageBox::warningContinueCancel( parentWidget(), i18n( "A file named %1 already exists. Do you want to overwrite it?" ) - .tqarg( curUrl.fileName() ), + .arg( curUrl.fileName() ), i18n( "File Already Exists" ), i18n("&Overwrite") ) == KMessageBox::Cancel) { continue; } @@ -2752,8 +2752,8 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, KMessageBox::error( parentWidget(), i18n( "%2 is detailed error description", "Could not write the file %1:\n%2" ) - .tqarg( file.name() ) - .tqarg( TQString::fromLocal8Bit( strerror( errno ) ) ), + .arg( file.name() ) + .arg( TQString::fromLocal8Bit( strerror( errno ) ) ), i18n( "KMail Error" ) ); return Failed; } @@ -2777,7 +2777,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node, { KMessageBox::error( parentWidget(), i18n( "Could not write the file %1." ) - .tqarg( url.path() ), + .arg( url.path() ), i18n( "KMail Error" ) ); return Failed; } @@ -3012,7 +3012,7 @@ KMCommand::Result KMIMChatCommand::execute() nameList.append( (*it).realName() ); } TQString names = nameList.join( TQString::fromLatin1( ",\n" ) ); - apology = apology.tqarg( names ); + apology = apology.arg( names ); } KMessageBox::sorry( parentWidget(), apology ); @@ -3452,7 +3452,7 @@ KMCommand::Result KMDeleteAttachmentCommand::doAttachmentModify() KMMessage *newMsg = new KMMessage(); newMsg->fromDwString( msg->asDwString() ); - newMsg->seStatus( msg->status() ); + newMsg->setStatus( msg->status() ); storeChangedMessage( newMsg ); return OK; @@ -3543,7 +3543,7 @@ void KMEditAttachmentCommand::editDone(KMail::EditorWatcher * watcher) KMMessage *newMsg = new KMMessage(); newMsg->fromDwString( msg->asDwString() ); - newMsg->seStatus( msg->status() ); + newMsg->setStatus( msg->status() ); storeChangedMessage( newMsg ); } @@ -3563,8 +3563,8 @@ KMCommand::Result CreateTodoCommand::execute() KMail::KorgHelper::ensureRunning(); - TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( msg->from() ) - .tqarg( msg->to() ).tqarg( msg->subject() ); + TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( msg->from() ) + .arg( msg->to() ).arg( msg->subject() ); KTempFile tf; tf.setAutoDelete( true ); @@ -3573,7 +3573,7 @@ KMCommand::Result CreateTodoCommand::execute() tf.close(); KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" ); - iface->openTodoEditor( i18n("Mail: %1").tqarg( msg->subject() ), txt, uri, + iface->openTodoEditor( i18n("Mail: %1").arg( msg->subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822", true ); delete iface; |