diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-02-26 17:36:32 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-02-26 17:36:32 +0100 |
commit | 5e8a56bc47937efcfc49fc0e2bf7e0be4cddb350 (patch) | |
tree | 3d6656244d1293db5aa0a110a5912d0dd5986600 | |
parent | a0dbb5507ff39a4f16c0a1c1f01402658586ac5f (diff) | |
download | kube-5e8a56bc47937efcfc49fc0e2bf7e0be4cddb350.tar.gz kube-5e8a56bc47937efcfc49fc0e2bf7e0be4cddb350.zip |
Removed unused code
-rw-r--r-- | framework/src/domain/mime/mimetreeparser/messagepart.cpp | 14 | ||||
-rw-r--r-- | 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() | |||
838 | } | 838 | } |
839 | } | 839 | } |
840 | 840 | ||
841 | void SignedMessagePart::startVerification(const QByteArray &text, const QTextCodec *aCodec) | ||
842 | { | ||
843 | startVerificationDetached(text, nullptr, QByteArray()); | ||
844 | |||
845 | if (!mNode && mMetaData.isSigned) { | ||
846 | setText(aCodec->toUnicode(mVerifiedText)); | ||
847 | } | ||
848 | } | ||
849 | |||
850 | void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime::Content *textNode, const QByteArray &signature) | 841 | void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime::Content *textNode, const QByteArray &signature) |
851 | { | 842 | { |
852 | mMetaData.isEncrypted = false; | 843 | mMetaData.isEncrypted = false; |
@@ -881,7 +872,6 @@ void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime: | |||
881 | void SignedMessagePart::setVerificationResult(const GpgME::VerificationResult &result, bool parseText, const QByteArray &plainText) | 872 | void SignedMessagePart::setVerificationResult(const GpgME::VerificationResult &result, bool parseText, const QByteArray &plainText) |
882 | { | 873 | { |
883 | auto signatures = result.signatures(); | 874 | auto signatures = result.signatures(); |
884 | mVerifiedText = plainText; | ||
885 | mMetaData.auditLogError = result.error(); | 875 | mMetaData.auditLogError = result.error(); |
886 | if (!signatures.empty()) { | 876 | if (!signatures.empty()) { |
887 | mMetaData.isSigned = true; | 877 | mMetaData.isSigned = true; |
@@ -889,9 +879,9 @@ void SignedMessagePart::setVerificationResult(const GpgME::VerificationResult &r | |||
889 | if (mNode && parseText) { | 879 | if (mNode && parseText) { |
890 | mOtp->mNodeHelper->setPartMetaData(mNode, mMetaData); | 880 | mOtp->mNodeHelper->setPartMetaData(mNode, mMetaData); |
891 | } | 881 | } |
892 | if (!mVerifiedText.isEmpty() && parseText) { | 882 | if (!plainText.isEmpty() && parseText) { |
893 | auto tempNode = new KMime::Content(); | 883 | auto tempNode = new KMime::Content(); |
894 | tempNode->setBody(mVerifiedText); | 884 | tempNode->setBody(plainText); |
895 | tempNode->parse(); | 885 | tempNode->parse(); |
896 | bindLifetime(tempNode); | 886 | bindLifetime(tempNode); |
897 | 887 | ||
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: | |||
353 | void setIsSigned(bool isSigned); | 353 | void setIsSigned(bool isSigned); |
354 | bool isSigned() const; | 354 | bool isSigned() const; |
355 | 355 | ||
356 | void startVerification(const QByteArray &text, const QTextCodec *aCodec); | ||
357 | void startVerificationDetached(const QByteArray &text, KMime::Content *textNode, const QByteArray &signature); | 356 | void startVerificationDetached(const QByteArray &text, KMime::Content *textNode, const QByteArray &signature); |
358 | void startVerification(); | 357 | void startVerification(); |
359 | 358 | ||
@@ -369,7 +368,6 @@ private: | |||
369 | protected: | 368 | protected: |
370 | GpgME::Protocol mProtocol; | 369 | GpgME::Protocol mProtocol; |
371 | QString mFromAddress; | 370 | QString mFromAddress; |
372 | QByteArray mVerifiedText; | ||
373 | KMime::Content *mSignedData; | 371 | KMime::Content *mSignedData; |
374 | 372 | ||
375 | friend EncryptedMessagePart; | 373 | friend EncryptedMessagePart; |