From e5fa422ab14d4178f1659038bc8ebac382faa0b1 Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Sat, 17 May 2003 13:55:13 +0000 Subject: [PATCH] compile with coolo's last change to qt-copy: I hope this time I got it right svn path=/trunk/kdepim/; revision=226385 --- cachedimapjob.cpp | 2 +- imapjob.cpp | 2 +- kmacctexppop.cpp | 2 +- objecttreeparser.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cachedimapjob.cpp b/cachedimapjob.cpp index e0e3353a2..9c5793dbb 100644 --- a/cachedimapjob.cpp +++ b/cachedimapjob.cpp @@ -207,7 +207,7 @@ void CachedImapJob::slotGetNextMessage(KIO::Job * job) size = mMsg->headerField("X-Length").toULong(); (*it).data.resize((*it).data.size() + 1); (*it).data[(*it).data.size() - 1] = '\0'; - mMsg->fromString(QCString((*it).data)); + mMsg->fromString(QCString((*it).data.data(), (*it).data.size() + 1)); //int idx = mFolder->find(mMsg); //if( idx >= 0 ) mFolder->take(idx); //else kdDebug(5006) << "weird, message not in folder!?!" << endl; diff --git a/imapjob.cpp b/imapjob.cpp index ebc5acd66..74b24eb57 100644 --- a/imapjob.cpp +++ b/imapjob.cpp @@ -222,7 +222,7 @@ void ImapJob::slotGetMessageResult( KIO::Job * job ) QString uid = msg->headerField("X-UID"); (*it).data.resize((*it).data.size() + 1); (*it).data[(*it).data.size() - 1] = '\0'; - msg->fromString(QCString((*it).data)); + msg->fromString(QCString((*it).data.data(), (*it).data.size() + 1)); msg->setHeaderField("X-UID",uid); msg->setComplete( TRUE ); emit messageRetrieved(msg); diff --git a/kmacctexppop.cpp b/kmacctexppop.cpp index db9dad65f..918645183 100644 --- a/kmacctexppop.cpp +++ b/kmacctexppop.cpp @@ -353,7 +353,7 @@ void KMAcctExpPop::slotMsgRetrieved(KIO::Job*, const QString & infoMsg) KMMessage *msg = new KMMessage; curMsgData.resize(curMsgData.size() + 1); curMsgData[curMsgData.size() - 1] = '\0'; - msg->fromString(QCString(curMsgData),TRUE); + msg->fromString(QCString(curMsgData.data(), curMsgData.size()),TRUE); if (stage == Head) { kdDebug(5006) << "Size of Message: " << (*lensOfMsgsPendingDownload.at( diff --git a/objecttreeparser.cpp b/objecttreeparser.cpp index 69896731e..bbee0868e 100644 --- a/objecttreeparser.cpp +++ b/objecttreeparser.cpp @@ -722,7 +722,7 @@ bool ObjectTreeParser::okDecryptMIME( partNode& data, if( cryptPlug ) { QByteArray ciphertext( data.msgPart().bodyDecodedBinary() ); - QCString cipherStr( ciphertext ); + QCString cipherStr( ciphertext.data(), ciphertext.size() + 1 ); bool cipherIsBinary = (-1 == cipherStr.find("BEGIN ENCRYPTED MESSAGE", 0, false) ) && (-1 == cipherStr.find("BEGIN PGP ENCRYPTED MESSAGE", 0, false) ) && (-1 == cipherStr.find("BEGIN PGP MESSAGE", 0, false) );