summaryrefslogtreecommitdiffstats
path: root/framework
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2018-04-26 21:45:55 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2018-04-26 21:45:55 +0200
commit22524c37d6e66757372dba609587e3c122d34dc3 (patch)
tree834a4986edf5e235b87e53ffdbe0c79e417424a3 /framework
parent31ebc4f47a990e65e9872d8e7251bee5f22153d7 (diff)
downloadkube-22524c37d6e66757372dba609587e3c122d34dc3.tar.gz
kube-22524c37d6e66757372dba609587e3c122d34dc3.zip
Removed some more unnecessary includes
Diffstat (limited to 'framework')
-rw-r--r--framework/src/domain/mime/mimetreeparser/autotests/setupenv.h1
-rw-r--r--framework/src/domain/mime/mimetreeparser/messagepart.cpp4
-rw-r--r--framework/src/domain/mime/mimetreeparser/messagepart.h7
3 files changed, 5 insertions, 7 deletions
diff --git a/framework/src/domain/mime/mimetreeparser/autotests/setupenv.h b/framework/src/domain/mime/mimetreeparser/autotests/setupenv.h
index 5ea3bf88..d60157db 100644
--- a/framework/src/domain/mime/mimetreeparser/autotests/setupenv.h
+++ b/framework/src/domain/mime/mimetreeparser/autotests/setupenv.h
@@ -21,7 +21,6 @@
21#ifndef MESSAGECORE_TESTS_UTIL_H 21#ifndef MESSAGECORE_TESTS_UTIL_H
22#define MESSAGECORE_TESTS_UTIL_H 22#define MESSAGECORE_TESTS_UTIL_H
23 23
24#include <gpgme++/key.h>
25#include <bodypartformatter.h> 24#include <bodypartformatter.h>
26#include <bodypartformatterbasefactory.h> 25#include <bodypartformatterbasefactory.h>
27 26
diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
index 9750ea9e..9f0df7f7 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
@@ -35,8 +35,11 @@
35#include <gpgme++/verificationresult.h> 35#include <gpgme++/verificationresult.h>
36#include <gpgme++/key.h> 36#include <gpgme++/key.h>
37#include <gpgme++/keylistresult.h> 37#include <gpgme++/keylistresult.h>
38#include <gpgme++/decryptionresult.h>
39#include <gpgme++/importresult.h>
38#include <gpgme.h> 40#include <gpgme.h>
39 41
42
40#include <QTextCodec> 43#include <QTextCodec>
41#include <sstream> 44#include <sstream>
42 45
@@ -1064,7 +1067,6 @@ bool EncryptedMessagePart::okDecryptMIME(KMime::Content &data)
1064 appendSubPart(subPart); 1067 appendSubPart(subPart);
1065 } 1068 }
1066 1069
1067 mDecryptRecipients = decryptResult.recipients();
1068 if (decryptResult.error() && mMetaData.isSigned) { 1070 if (decryptResult.error() && mMetaData.isSigned) {
1069 //Only a signed part 1071 //Only a signed part
1070 mMetaData.isEncrypted = false; 1072 mMetaData.isEncrypted = false;
diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.h b/framework/src/domain/mime/mimetreeparser/messagepart.h
index 31864ee5..37f8f168 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.h
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.h
@@ -26,10 +26,6 @@
26 26
27#include <KMime/Message> 27#include <KMime/Message>
28 28
29#include <gpgme++/verificationresult.h>
30#include <gpgme++/decryptionresult.h>
31#include <gpgme++/importresult.h>
32
33#include <QString> 29#include <QString>
34#include <QSharedPointer> 30#include <QSharedPointer>
35 31
@@ -39,6 +35,8 @@ class PartPrivate;
39namespace GpgME 35namespace GpgME
40{ 36{
41class ImportResult; 37class ImportResult;
38class VerificationResult;
39class Signature;
42} 40}
43 41
44namespace KMime 42namespace KMime
@@ -336,7 +334,6 @@ protected:
336 const CryptoProtocol mProtocol; 334 const CryptoProtocol mProtocol;
337 QString mFromAddress; 335 QString mFromAddress;
338 QByteArray mVerifiedText; 336 QByteArray mVerifiedText;
339 std::vector<GpgME::DecryptionResult::Recipient> mDecryptRecipients;
340 KMime::Content *mEncryptedNode; 337 KMime::Content *mEncryptedNode;
341 338
342 friend class DefaultRendererPrivate; 339 friend class DefaultRendererPrivate;