From 5e8a56bc47937efcfc49fc0e2bf7e0be4cddb350 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 26 Feb 2018 17:36:32 +0100 Subject: Removed unused code --- framework/src/domain/mime/mimetreeparser/messagepart.cpp | 14 ++------------ framework/src/domain/mime/mimetreeparser/messagepart.h | 2 -- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp index fdcb6284..995ea811 100644 --- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp +++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp @@ -838,15 +838,6 @@ void SignedMessagePart::startVerification() } } -void SignedMessagePart::startVerification(const QByteArray &text, const QTextCodec *aCodec) -{ - startVerificationDetached(text, nullptr, QByteArray()); - - if (!mNode && mMetaData.isSigned) { - setText(aCodec->toUnicode(mVerifiedText)); - } -} - void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime::Content *textNode, const QByteArray &signature) { mMetaData.isEncrypted = false; @@ -881,7 +872,6 @@ void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime: void SignedMessagePart::setVerificationResult(const GpgME::VerificationResult &result, bool parseText, const QByteArray &plainText) { auto signatures = result.signatures(); - mVerifiedText = plainText; mMetaData.auditLogError = result.error(); if (!signatures.empty()) { mMetaData.isSigned = true; @@ -889,9 +879,9 @@ void SignedMessagePart::setVerificationResult(const GpgME::VerificationResult &r if (mNode && parseText) { mOtp->mNodeHelper->setPartMetaData(mNode, mMetaData); } - if (!mVerifiedText.isEmpty() && parseText) { + if (!plainText.isEmpty() && parseText) { auto tempNode = new KMime::Content(); - tempNode->setBody(mVerifiedText); + tempNode->setBody(plainText); tempNode->parse(); bindLifetime(tempNode); diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.h b/framework/src/domain/mime/mimetreeparser/messagepart.h index b958ae8e..1d416e8f 100644 --- a/framework/src/domain/mime/mimetreeparser/messagepart.h +++ b/framework/src/domain/mime/mimetreeparser/messagepart.h @@ -353,7 +353,6 @@ public: void setIsSigned(bool isSigned); bool isSigned() const; - void startVerification(const QByteArray &text, const QTextCodec *aCodec); void startVerificationDetached(const QByteArray &text, KMime::Content *textNode, const QByteArray &signature); void startVerification(); @@ -369,7 +368,6 @@ private: protected: GpgME::Protocol mProtocol; QString mFromAddress; - QByteArray mVerifiedText; KMime::Content *mSignedData; friend EncryptedMessagePart; -- cgit v1.2.3