diff options
author | Timothy Pearson <[email protected]> | 2011-12-19 11:59:01 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-19 11:59:01 -0600 |
commit | 716a5de8870d7c02bb4d0aed72f30291b17b763a (patch) | |
tree | 29e58b213ead28151ccf7eb33d12c968ea844120 /kmail/kmmessage.cpp | |
parent | 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 (diff) | |
download | tdepim-716a5de8870d7c02bb4d0aed72f30291b17b763a.tar.gz tdepim-716a5de8870d7c02bb4d0aed72f30291b17b763a.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'kmail/kmmessage.cpp')
-rw-r--r-- | kmail/kmmessage.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index ecf1e763a..469858a41 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -351,7 +351,7 @@ void KMMessage::removePrivateHeaderFields() { } //----------------------------------------------------------------------------- -void KMMessage::seStatusFields() +void KMMessage::setStatusFields() { char str[2] = { 0, 0 }; @@ -394,8 +394,8 @@ DwMediaType& KMMessage::dwContentType() return mMsg->Headers().ContentType(); } -void KMMessage::fromByteArray( const TQByteArray & ba, bool seStatus ) { - return fromDwString( DwString( ba.data(), ba.size() ), seStatus ); +void KMMessage::fromByteArray( const TQByteArray & ba, bool setStatus ) { + return fromDwString( DwString( ba.data(), ba.size() ), setStatus ); } void KMMessage::fromString( const TQCString & str, bool aSeStatus ) { @@ -410,10 +410,10 @@ void KMMessage::fromDwString(const DwString& str, bool aSeStatus) mMsg->Parse(); if (aSeStatus) { - seStatus(headerField("Status").latin1(), headerField("X-Status").latin1()); + setStatus(headerField("Status").latin1(), headerField("X-Status").latin1()); setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) ); setSignatureStateChar( headerField("X-KMail-SignatureState").at(0) ); - setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").tqat(0).latin1() ) ); + setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").at(0).latin1() ) ); } if ( invitationState() == KMMsgInvitationUnknown && readyToShow() ) updateInvitationState(); @@ -1081,7 +1081,7 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy, parser.process( this ); } } - // seStatus(KMMsgStatusReplied); + // setStatus(KMMsgStatusReplied); msg->link(this, KMMsgStatusReplied); if ( parent() && parent()->putRepliesInSameFolder() ) @@ -1141,14 +1141,14 @@ KMMessage* KMMessage::createRedirect( const TQString &toStr ) // X-KMail-Redirect-From: content TQString strByWayOf = TQString("%1 (by way of %2 <%3>)") - .tqarg( from() ) - .tqarg( ident.fullName() ) - .tqarg( ident.primaryEmailAddress() ); + .arg( from() ) + .arg( ident.fullName() ) + .arg( ident.primaryEmailAddress() ); // Resent-From: content TQString strFrom = TQString("%1 <%2>") - .tqarg( ident.fullName() ) - .tqarg( ident.primaryEmailAddress() ); + .arg( ident.fullName() ) + .arg( ident.primaryEmailAddress() ); // format the current date to be used in Resent-Date: TQString origDate = msg->headerField( "Date" ); @@ -3160,7 +3160,7 @@ void KMMessage::bodyPart(int aIdx, KMMessagePart* aPart) const if ( DwBodyPart *part = dwBodyPart( aIdx ) ) { KMMessage::bodyPart(part, aPart); if( aPart->name().isEmpty() ) - aPart->setName( i18n("Attachment: %1").tqarg( aIdx ) ); + aPart->setName( i18n("Attachment: %1").arg( aIdx ) ); } } @@ -3193,7 +3193,7 @@ bool KMMessage::deleteBodyPart( int partIndex ) dummyPart.duplicate( part ); TQString comment = i18n("This attachment has been deleted."); if ( !part.fileName().isEmpty() ) - comment = i18n( "The attachment '%1' has been deleted." ).tqarg( part.fileName() ); + comment = i18n( "The attachment '%1' has been deleted." ).arg( part.fileName() ); dummyPart.setContentDescription( comment ); dummyPart.setBodyEncodedBinary( TQByteArray() ); TQCString cd = dummyPart.contentDisposition(); @@ -4037,7 +4037,7 @@ void KMMessage::readConfig() int languageNr = config->readNumEntry("reply-current-language",0); { // area for config group "KMMessage #n" - KConfigGroupSaver saver(config, TQString("KMMessage #%1").tqarg(languageNr)); + KConfigGroupSaver saver(config, TQString("KMMessage #%1").arg(languageNr)); sReplyLanguage = config->readEntry("language",KGlobal::locale()->language()); sReplyStr = config->readEntry("phrase-reply", i18n("On %D, you wrote:")); @@ -4145,11 +4145,11 @@ void KMMessage::setCharset( const TQCString &charset, DwEntity *entity ) //----------------------------------------------------------------------------- -void KMMessage::seStatus(const KMMsgStatus aStatus, int idx) +void KMMessage::setStatus(const KMMsgStatus aStatus, int idx) { if (mStatus == aStatus) return; - KMMsgBase::seStatus(aStatus, idx); + KMMsgBase::setStatus(aStatus, idx); } void KMMessage::setEncryptionState(const KMMsgEncryptionState s, int idx) @@ -4347,11 +4347,11 @@ void KMMessage::updateInvitationState() cntType += '/'; cntType += mMsg->Headers().ContentType().SubtypeStr().c_str(); if ( cntType.lower() == "text/calendar" ) { - seStatus( KMMsgStatusHasInvitation ); + setStatus( KMMsgStatusHasInvitation ); return; } } - seStatus( KMMsgStatusHasNoInvitation ); + setStatus( KMMsgStatusHasNoInvitation ); return; } @@ -4364,7 +4364,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) if ( !part ) { // kdDebug(5006) << "updateAttachmentState - no part!" << endl; - seStatus( KMMsgStatusHasNoAttach ); + setStatus( KMMsgStatusHasNoAttach ); return; } @@ -4404,7 +4404,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) part->Headers().ContentType().Subtype() != DwMime::kSubtypePgpSignature && part->Headers().ContentType().Subtype() != DwMime::kSubtypePkcs7Signature ) ) { - seStatus( KMMsgStatusHasAttach ); + setStatus( KMMsgStatusHasAttach ); } return; } @@ -4429,7 +4429,7 @@ void KMMessage::updateAttachmentState( DwBodyPart* part ) if ( part->Next() ) updateAttachmentState( part->Next() ); else if ( attachmentState() == KMMsgAttachmentUnknown ) - seStatus( KMMsgStatusHasNoAttach ); + setStatus( KMMsgStatusHasNoAttach ); } void KMMessage::setBodyFromUnicode( const TQString &str, DwEntity *entity ) |