diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-04-26 16:43:00 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-04-26 16:48:21 +0200 |
commit | ae20f0a057f4740e3eedb1641d99c37601ad0b7f (patch) | |
tree | e89f8d6d0ee1e0b04ae57fecee82830f7359d406 /framework/src/domain/composercontroller.h | |
parent | e19a82c82594e3544ff5e4e82715095cf1a28c2f (diff) | |
download | kube-ae20f0a057f4740e3eedb1641d99c37601ad0b7f.tar.gz kube-ae20f0a057f4740e3eedb1641d99c37601ad0b7f.zip |
No more direct GpgMe usage in the interfaces.
Diffstat (limited to 'framework/src/domain/composercontroller.h')
-rw-r--r-- | framework/src/domain/composercontroller.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/framework/src/domain/composercontroller.h b/framework/src/domain/composercontroller.h index ac83dfd3..17271dce 100644 --- a/framework/src/domain/composercontroller.h +++ b/framework/src/domain/composercontroller.h | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <QStandardItemModel> | 26 | #include <QStandardItemModel> |
27 | #include <sink/applicationdomaintype.h> | 27 | #include <sink/applicationdomaintype.h> |
28 | #include <KMime/Message> | 28 | #include <KMime/Message> |
29 | #include <gpgme++/key.h> | 29 | #include <mime/mailcrypto.h> |
30 | 30 | ||
31 | #include "completer.h" | 31 | #include "completer.h" |
32 | #include "selector.h" | 32 | #include "selector.h" |
@@ -39,7 +39,6 @@ inline bool operator !=(const KMime::Types::Mailbox &l, const KMime::Types::Mail | |||
39 | 39 | ||
40 | Q_DECLARE_METATYPE(KMime::Types::Mailbox); | 40 | Q_DECLARE_METATYPE(KMime::Types::Mailbox); |
41 | 41 | ||
42 | Q_DECLARE_METATYPE(GpgME::Key); | ||
43 | 42 | ||
44 | namespace KMime { | 43 | namespace KMime { |
45 | class Message; | 44 | class Message; |
@@ -66,7 +65,7 @@ class ComposerController : public Kube::Controller | |||
66 | KUBE_CONTROLLER_PROPERTY(KMime::Message::Ptr, ExistingMessage, existingMessage) | 65 | KUBE_CONTROLLER_PROPERTY(KMime::Message::Ptr, ExistingMessage, existingMessage) |
67 | KUBE_CONTROLLER_PROPERTY(Sink::ApplicationDomain::Mail, ExistingMail, existingMail) | 66 | KUBE_CONTROLLER_PROPERTY(Sink::ApplicationDomain::Mail, ExistingMail, existingMail) |
68 | 67 | ||
69 | KUBE_CONTROLLER_PROPERTY(/*std::vector<GpgME::Key>*/QVariant, PersonalKeys, personalKeys) | 68 | KUBE_CONTROLLER_PROPERTY(/*std::vector<MailCrypto::Key>*/QVariant, PersonalKeys, personalKeys) |
70 | KUBE_CONTROLLER_PROPERTY(bool, FoundPersonalKeys, foundPersonalKeys) | 69 | KUBE_CONTROLLER_PROPERTY(bool, FoundPersonalKeys, foundPersonalKeys) |
71 | 70 | ||
72 | KUBE_CONTROLLER_LISTCONTROLLER(to) | 71 | KUBE_CONTROLLER_LISTCONTROLLER(to) |
@@ -110,7 +109,7 @@ private: | |||
110 | void setMessage(const QSharedPointer<KMime::Message> &msg); | 109 | void setMessage(const QSharedPointer<KMime::Message> &msg); |
111 | void addAttachmentPart(KMime::Content *partToAttach); | 110 | void addAttachmentPart(KMime::Content *partToAttach); |
112 | KMime::Message::Ptr assembleMessage(); | 111 | KMime::Message::Ptr assembleMessage(); |
113 | std::vector<GpgME::Key> getRecipientKeys(); | 112 | std::vector<MailCrypto::Key> getRecipientKeys(); |
114 | 113 | ||
115 | QScopedPointer<Completer> mRecipientCompleter; | 114 | QScopedPointer<Completer> mRecipientCompleter; |
116 | QScopedPointer<Selector> mIdentitySelector; | 115 | QScopedPointer<Selector> mIdentitySelector; |