diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-16 20:17:18 +0000 |
commit | f4fae92b6768541e2952173c3d4b09040f95bf7e (patch) | |
tree | d8c5d93232235cd635f3310b4d95490df181ba2d /kmail/kmmsgpart.cpp | |
parent | 125c0a08265b75a133644d3b55f47e37c919f45d (diff) | |
download | tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip |
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/kmmsgpart.cpp')
-rw-r--r-- | kmail/kmmsgpart.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kmail/kmmsgpart.cpp b/kmail/kmmsgpart.cpp index 112236c03..a96d6aae2 100644 --- a/kmail/kmmsgpart.cpp +++ b/kmail/kmmsgpart.cpp @@ -406,7 +406,7 @@ TQCString KMMessagePart::bodyDecoded(void) const //kdWarning( result.length() != (unsigned int)len, 5006 ) // << "KMMessagePart::bodyDecoded(): body is binary but used as text!" << endl; - result = result.replace( "\r\n", "\n" ); // CRLF -> LF conversion + result = result.tqreplace( "\r\n", "\n" ); // CRLF -> LF conversion assert( mBodyDecodedSize < 0 || mBodyDecodedSize == len ); if ( mBodyDecodedSize < 0 ) @@ -422,7 +422,7 @@ void KMMessagePart::magicSetType(bool aAutoDecode) KMimeMagic::self()->setFollowLinks( true ); // is it necessary ? const TQByteArray body = ( aAutoDecode ) ? bodyDecodedBinary() : mBody ; - KMimeMagicResult * result = KMimeMagic::self()->findBufferType( body ); + KMimeMagicResult * result = KMimeMagic::self()->tqfindBufferType( body ); TQString mimetype = result->mimeType(); const int sep = mimetype.find('/'); @@ -445,7 +445,7 @@ TQString KMMessagePart::iconName( int size ) const if ( fileName.isEmpty() ) fileName = this->name(); if ( !fileName.isEmpty() ) { - fileName = KMimeType::findByPath( "/tmp/"+fileName, 0, true )->icon( TQString::null, true ); + fileName = KMimeType::tqfindByPath( "/tmp/"+fileName, 0, true )->icon( TQString::null, true ); } } @@ -558,7 +558,7 @@ TQString KMMessagePart::fileName(void) const // Allow for multiple filname*0, filename*1, ... params (defined by RFC 2231) // in the Content-Disposision - if ( mContentDisposition.contains( "filename*", false ) ) { + if ( mContentDisposition.tqcontains( "filename*", false ) ) { // It's RFC 2231 encoded, so extract the file name with the 2231 method str = KMMsgBase::extractRFC2231HeaderField( mContentDisposition, "filename" ); |