From 6d639c14028c3274e8bd104f3698763133bf31e1 Mon Sep 17 00:00:00 2001
From: Ingo Klcker <kloecker@kde.org>
Date: Fri, 30 Sep 2005 20:39:04 +0000
Subject: [PATCH] Get rid of all usages of KPIM::kBytesToFile (replaced by the
 safer KPIM::kByteArrayToFile).

svn path=/trunk/KDE/kdepim/; revision=465783
---
 kmcommands.cpp  |  8 ++++----
 kmreaderwin.cpp | 17 +++++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/kmcommands.cpp b/kmcommands.cpp
index d3ec1b4f8..87b9e08c0 100644
--- a/kmcommands.cpp
+++ b/kmcommands.cpp
@@ -2756,12 +2756,12 @@ QString KMHandleAttachmentCommand::createAtmFileLink() const
     kdDebug(5006) << k_funcinfo << "rewriting attachment" << endl;
     // there is something wrong so write the file again
     QByteArray data = mNode->msgPart().bodyDecodedBinary();
-    size_t size = data.size();
-    if ( mNode->msgPart().type() == DwMime::kTypeText && size) {
+    if ( mNode->msgPart().type() == DwMime::kTypeText && data.size() > 0 ) {
       // convert CRLF to LF before writing text attachments to disk
-      size = KMail::Util::crlf2lf( data.data(), size );
+      const size_t newsize = KMail::Util::crlf2lf( data.data(), data.size() );
+      data.truncate( newsize );
     }
-    KPIM::kBytesToFile( data.data(), size, mAtmName, false, false, false );
+    KPIM::kByteArrayToFile( data, mAtmName, false, false, false );
   }
 
   KTempFile *linkFile = new KTempFile( locateLocal("tmp", atmFileInfo.fileName() +"_["),
diff --git a/kmreaderwin.cpp b/kmreaderwin.cpp
index d303d6ad3..f8e19fe8c 100644
--- a/kmreaderwin.cpp
+++ b/kmreaderwin.cpp
@@ -858,11 +858,12 @@ void KMReaderWin::update( KMail::Interface::Observable * observable )
   // we have to set it writeable temporarily
   ::chmod( QFile::encodeName( mAtmCurrentName ), S_IRWXU );
   QByteArray data = node->msgPart().bodyDecodedBinary();
-  size_t size = data.size();
-  if ( node->msgPart().type() == DwMime::kTypeText && size) {
-    size = KMail::Util::crlf2lf( data.data(), size );
+  if ( node->msgPart().type() == DwMime::kTypeText && data.size() > 0 ) {
+    // convert CRLF to LF before writing text attachments to disk
+    const size_t newsize = KMail::Util::crlf2lf( data.data(), data.size() );
+    data.truncate( newsize );
   }
-  KPIM::kBytesToFile( data.data(), size, mAtmCurrentName, false, false, false );
+  KPIM::kByteArrayToFile( data, mAtmCurrentName, false, false, false );
   ::chmod( QFile::encodeName( mAtmCurrentName ), S_IRUSR );
 }
 
@@ -1683,12 +1684,12 @@ QString KMReaderWin::writeMessagePartToTempFile( KMMessagePart* aMsgPart,
   fname += "/" + fileName;
 
   QByteArray data = aMsgPart->bodyDecodedBinary();
-  size_t size = data.size();
-  if ( aMsgPart->type() == DwMime::kTypeText && size) {
+  if ( aMsgPart->type() == DwMime::kTypeText && data.size() > 0 ) {
     // convert CRLF to LF before writing text attachments to disk
-    size = KMail::Util::crlf2lf( data.data(), size );
+    const size_t newsize = KMail::Util::crlf2lf( data.data(), data.size() );
+    data.truncate( newsize );
   }
-  if( !KPIM::kBytesToFile( data.data(), size, fname, false, false, false ) )
+  if( !KPIM::kByteArrayToFile( data, fname, false, false, false ) )
     return QString::null;
 
   mTempFiles.append( fname );