diff options
Diffstat (limited to 'kmail/kmmessage.cpp')
| -rw-r--r-- | kmail/kmmessage.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index d4ef0ec49..45ab58870 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -97,7 +97,7 @@ KMMessage::KMMessage(DwMessage* aMsg) } //----------------------------------------------------------------------------- -KMMessage::KMMessage(KMFolder* tqparent): KMMsgBase(tqparent) +KMMessage::KMMessage(KMFolder* parent): KMMsgBase(parent) { init(); } @@ -248,10 +248,10 @@ void KMMessage::setTransferInProgress(bool value, bool force) MessageProperty::setTransferInProgress( getMsgSerNum(), value, force ); if ( !transferInProgress() && sPendingDeletes.contains( this ) ) { sPendingDeletes.remove( this ); - if ( tqparent() ) { - int idx = tqparent()->find( this ); + if ( parent() ) { + int idx = parent()->find( this ); if ( idx > 0 ) { - tqparent()->removeMsg( idx ); + parent()->removeMsg( idx ); } } } @@ -883,9 +883,9 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy, msg->setCharset("utf-8"); // determine the mailing list posting address - if ( tqparent() && tqparent()->isMailingListEnabled() && - !tqparent()->mailingListPostAddress().isEmpty() ) { - mailingListAddresses << tqparent()->mailingListPostAddress(); + if ( parent() && parent()->isMailingListEnabled() && + !parent()->mailingListPostAddress().isEmpty() ) { + mailingListAddresses << parent()->mailingListPostAddress(); } if ( headerField("List-Post").find( "mailto:", 0, false ) != -1 ) { TQString listPost = headerField("List-Post"); @@ -1084,8 +1084,8 @@ KMMessage* KMMessage::createReply( KMail::ReplyStrategy replyStrategy, // setqStatus(KMMsgStatusReplied); msg->link(this, KMMsgStatusReplied); - if ( tqparent() && tqparent()->putRepliesInSameFolder() ) - msg->setFcc( tqparent()->idString() ); + if ( parent() && parent()->putRepliesInSameFolder() ) + msg->setFcc( parent()->idString() ); // replies to an encrypted message should be encrypted as well if ( encryptionState() == KMMsgPartiallyEncrypted || @@ -1729,8 +1729,8 @@ uint KMMessage::identityUoid() const { if ( !ok || id == 0 ) id = kmkernel->identityManager()->identityForAddress( to() + ", " + cc() ).uoid(); - if ( id == 0 && tqparent() ) - id = tqparent()->identity(); + if ( id == 0 && parent() ) + id = parent()->identity(); return id; } @@ -4275,7 +4275,7 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray & TQString specifier = partSpecifier; if ( partSpecifier.endsWith(".HEADER") || partSpecifier.endsWith(".MIME") ) { - // get the tqparent bodypart + // get the parent bodypart specifier = partSpecifier.section( '.', 0, -2 ); } @@ -4309,16 +4309,16 @@ void KMMessage::updateBodyPart(const TQString partSpecifier, const TQByteArray & TQString parentSpec = partSpecifier.section( '.', 0, -2 ); if ( !parentSpec.isEmpty() ) { - DwBodyPart* tqparent = findDwBodyPart( getFirstDwBodyPart(), parentSpec ); - if ( tqparent && tqparent->hasHeaders() && tqparent->Headers().HasContentType() ) + DwBodyPart* parent = findDwBodyPart( getFirstDwBodyPart(), parentSpec ); + if ( parent && parent->hasHeaders() && parent->Headers().HasContentType() ) { - const DwMediaType& contentType = tqparent->Headers().ContentType(); + const DwMediaType& contentType = parent->Headers().ContentType(); if ( contentType.Type() == DwMime::kTypeMessage && contentType.Subtype() == DwMime::kSubtypeRfc822 ) { // an embedded message that is not multipart // update this directly - tqparent->Body().Message()->Body().FromString( content ); + parent->Body().Message()->Body().FromString( content ); } } } |