From f92a5ff29d728cd9cc4dbe5819d7b43287f802e3 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 20 Feb 2018 19:11:08 +0100
Subject: Avoid unnecessary member variables

---
 framework/src/domain/mime/mimetreeparser/messagepart.cpp | 9 ++++-----
 framework/src/domain/mime/mimetreeparser/messagepart.h   | 3 +--
 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,
     return result;
 }
 
-void SignedMessagePart::sigStatusToMetaData()
+void SignedMessagePart::sigStatusToMetaData(const GpgME::Signature &signature)
 {
     GpgME::Key key;
-    GpgME::Signature signature = mSignatures.front();
     mMetaData.status_code = signatureToStatus(signature);
     mMetaData.isGoodSignature = mMetaData.status_code & GPGME_SIG_STAT_GOOD;
     // save extended signature status flags
@@ -883,12 +882,12 @@ void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime:
 
 void SignedMessagePart::setVerificationResult(const GpgME::VerificationResult &result, KMime::Content *textNode, const QByteArray &plainText)
 {
-    mSignatures = result.signatures();
+    auto signatures = result.signatures();
     mVerifiedText = plainText;
     mMetaData.auditLogError = result.error();
-    if (!mSignatures.empty()) {
+    if (!signatures.empty()) {
         mMetaData.isSigned = true;
-        sigStatusToMetaData();
+        sigStatusToMetaData(signatures.front());
         if (mNode && !textNode) {
             mOtp->mNodeHelper->setPartMetaData(mNode, mMetaData);
         }
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:
     void startVerification();
 
     QByteArray mDecryptedData;
-    std::vector<GpgME::Signature> mSignatures;
 
     QString plaintextContent() const Q_DECL_OVERRIDE;
     QString htmlContent() const Q_DECL_OVERRIDE;
 
 private:
-    void sigStatusToMetaData();
+    void sigStatusToMetaData(const GpgME::Signature &signature);
     void setVerificationResult(const GpgME::VerificationResult &result, KMime::Content *textNode, const QByteArray &plainText);
 protected:
     GpgME::Protocol mProtocol;
-- 
cgit v1.2.3