summaryrefslogtreecommitdiffstats
path: root/framework
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2018-02-20 19:11:08 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2018-02-20 19:22:12 +0100
commitf92a5ff29d728cd9cc4dbe5819d7b43287f802e3 (patch)
treeca8ae0ccfcd8ae15aa4cc2c5559fa772da06c86d /framework
parente8632e18e0bef91873c6024073b5f461c07d6fe3 (diff)
downloadkube-f92a5ff29d728cd9cc4dbe5819d7b43287f802e3.tar.gz
kube-f92a5ff29d728cd9cc4dbe5819d7b43287f802e3.zip
Avoid unnecessary member variables
Diffstat (limited to 'framework')
-rw-r--r--framework/src/domain/mime/mimetreeparser/messagepart.cpp9
-rw-r--r--framework/src/domain/mime/mimetreeparser/messagepart.h3
2 files changed, 5 insertions, 7 deletions
diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
index 4f27704f..e628645c 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
@@ -747,10 +747,9 @@ static GpgME::KeyListResult listKeys(GpgME::Context * ctx, const char *pattern,
747 return result; 747 return result;
748} 748}
749 749
750void SignedMessagePart::sigStatusToMetaData() 750void SignedMessagePart::sigStatusToMetaData(const GpgME::Signature &signature)
751{ 751{
752 GpgME::Key key; 752 GpgME::Key key;
753 GpgME::Signature signature = mSignatures.front();
754 mMetaData.status_code = signatureToStatus(signature); 753 mMetaData.status_code = signatureToStatus(signature);
755 mMetaData.isGoodSignature = mMetaData.status_code & GPGME_SIG_STAT_GOOD; 754 mMetaData.isGoodSignature = mMetaData.status_code & GPGME_SIG_STAT_GOOD;
756 // save extended signature status flags 755 // save extended signature status flags
@@ -883,12 +882,12 @@ void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime:
883 882
884void SignedMessagePart::setVerificationResult(const GpgME::VerificationResult &result, KMime::Content *textNode, const QByteArray &plainText) 883void SignedMessagePart::setVerificationResult(const GpgME::VerificationResult &result, KMime::Content *textNode, const QByteArray &plainText)
885{ 884{
886 mSignatures = result.signatures(); 885 auto signatures = result.signatures();
887 mVerifiedText = plainText; 886 mVerifiedText = plainText;
888 mMetaData.auditLogError = result.error(); 887 mMetaData.auditLogError = result.error();
889 if (!mSignatures.empty()) { 888 if (!signatures.empty()) {
890 mMetaData.isSigned = true; 889 mMetaData.isSigned = true;
891 sigStatusToMetaData(); 890 sigStatusToMetaData(signatures.front());
892 if (mNode && !textNode) { 891 if (mNode && !textNode) {
893 mOtp->mNodeHelper->setPartMetaData(mNode, mMetaData); 892 mOtp->mNodeHelper->setPartMetaData(mNode, mMetaData);
894 } 893 }
diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.h b/framework/src/domain/mime/mimetreeparser/messagepart.h
index 124bc50e..75208e52 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.h
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.h
@@ -358,13 +358,12 @@ public:
358 void startVerification(); 358 void startVerification();
359 359
360 QByteArray mDecryptedData; 360 QByteArray mDecryptedData;
361 std::vector<GpgME::Signature> mSignatures;
362 361
363 QString plaintextContent() const Q_DECL_OVERRIDE; 362 QString plaintextContent() const Q_DECL_OVERRIDE;
364 QString htmlContent() const Q_DECL_OVERRIDE; 363 QString htmlContent() const Q_DECL_OVERRIDE;
365 364
366private: 365private:
367 void sigStatusToMetaData(); 366 void sigStatusToMetaData(const GpgME::Signature &signature);
368 void setVerificationResult(const GpgME::VerificationResult &result, KMime::Content *textNode, const QByteArray &plainText); 367 void setVerificationResult(const GpgME::VerificationResult &result, KMime::Content *textNode, const QByteArray &plainText);
369protected: 368protected:
370 GpgME::Protocol mProtocol; 369 GpgME::Protocol mProtocol;