From af820811ec7d0818f988cd728d745cede88ab45f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Tue, 14 Dec 2021 14:49:39 +0100 Subject: qt: Add pattern used for WKD lookup to result * lang/qt/src/qgpgmewkdlookupjob.cpp (run_wkd_get): Change type of arg email. (lookup_keys): Add pattern to result. * lang/qt/src/wkdlookupresult.h (class WKDLookupResult): Add arg pattern to c'tors. Add member function pattern. * lang/qt/src/wkdlookupresult.cpp (class WKDLookupResult::Private): Add field pattern. (WKDLookupResult::WKDLookupResult): Pass pattern to pimpl. (WKDLookupResult::pattern): New. * lang/qt/tests/t-wkdlookup.cpp (testWKDLookupAsync, testWKDLookupSync, testLookupWithNoResultAsync): Check pattern. -- GnuPG-bug-id: 5728 --- lang/qt/src/wkdlookupresult.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'lang/qt/src/wkdlookupresult.cpp') diff --git a/lang/qt/src/wkdlookupresult.cpp b/lang/qt/src/wkdlookupresult.cpp index 71aa75cf..ac1a89e9 100644 --- a/lang/qt/src/wkdlookupresult.cpp +++ b/lang/qt/src/wkdlookupresult.cpp @@ -45,6 +45,7 @@ using namespace GpgME; class WKDLookupResult::Private { public: + std::string pattern; GpgME::Data keyData; std::string source; }; @@ -53,15 +54,15 @@ WKDLookupResult::WKDLookupResult() = default; WKDLookupResult::~WKDLookupResult() = default; -WKDLookupResult::WKDLookupResult(const Error &error) +WKDLookupResult::WKDLookupResult(const std::string &pattern, const Error &error) : Result{error} - , d{} + , d{new Private{pattern, {}, {}}} { } -WKDLookupResult::WKDLookupResult(const Data &keyData, const std::string &source, const Error &error) +WKDLookupResult::WKDLookupResult(const std::string &pattern, const Data &keyData, const std::string &source, const Error &error) : Result{error} - , d{new Private{keyData, source}} + , d{new Private{pattern, keyData, source}} { } @@ -95,6 +96,11 @@ bool WKDLookupResult::isNull() const return !d && !bool(error()); } +std::string WKDLookupResult::pattern() const +{ + return d ? d->pattern : std::string{}; +} + Data WKDLookupResult::keyData() const { return d ? d->keyData : Data{}; -- cgit v1.2.3