diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-07-23 14:51:47 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-07-23 20:42:58 +0200 |
commit | 3bfb848e6db4e7d5a7f1f9c5663bf7262402fed9 (patch) | |
tree | bd2dca46e715f30dc157a4813a81208f06df0134 | |
parent | 962c2ca25b9c2447e9577d11dc8afa0586e52b85 (diff) | |
download | kube-3bfb848e6db4e7d5a7f1f9c5663bf7262402fed9.tar.gz kube-3bfb848e6db4e7d5a7f1f9c5663bf7262402fed9.zip |
Namespacing to avoid a conflict with that other context.
-rw-r--r-- | framework/src/domain/mime/crypto.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/framework/src/domain/mime/crypto.cpp b/framework/src/domain/mime/crypto.cpp index 8450107a..b85820d4 100644 --- a/framework/src/domain/mime/crypto.cpp +++ b/framework/src/domain/mime/crypto.cpp | |||
@@ -45,6 +45,7 @@ QDebug operator<< (QDebug d, const Error &error) | |||
45 | return d; | 45 | return d; |
46 | } | 46 | } |
47 | 47 | ||
48 | namespace Crypto { | ||
48 | struct Data { | 49 | struct Data { |
49 | Data(const QByteArray &buffer) | 50 | Data(const QByteArray &buffer) |
50 | { | 51 | { |
@@ -61,6 +62,7 @@ struct Data { | |||
61 | } | 62 | } |
62 | gpgme_data_t data; | 63 | gpgme_data_t data; |
63 | }; | 64 | }; |
65 | } | ||
64 | 66 | ||
65 | static gpgme_error_t checkEngine(CryptoProtocol protocol) | 67 | static gpgme_error_t checkEngine(CryptoProtocol protocol) |
66 | { | 68 | { |
@@ -103,6 +105,7 @@ static std::pair<gpgme_error_t, gpgme_ctx_t> createForProtocol(CryptoProtocol pr | |||
103 | } | 105 | } |
104 | 106 | ||
105 | 107 | ||
108 | namespace Crypto { | ||
106 | struct Context { | 109 | struct Context { |
107 | Context(CryptoProtocol protocol = OpenPGP) | 110 | Context(CryptoProtocol protocol = OpenPGP) |
108 | { | 111 | { |
@@ -123,6 +126,7 @@ struct Context { | |||
123 | Error error; | 126 | Error error; |
124 | gpgme_ctx_t context; | 127 | gpgme_ctx_t context; |
125 | }; | 128 | }; |
129 | } | ||
126 | 130 | ||
127 | 131 | ||
128 | static QByteArray toBA(gpgme_data_t out) | 132 | static QByteArray toBA(gpgme_data_t out) |