From 9e8c8e448ec83c454fb310f80ce0bf9f828a7145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Thu, 5 May 2022 10:39:26 +0200 Subject: [PATCH] qt: Revert change of result signal of RefreshKeysJob * lang/qt/src/refreshkeysjob.h (RefreshKeysJob::result): Remove optional parameters auditLogAsHtml and auditLogError. * lang/qt/tests/run-refreshkeysjob.cpp (main): Update accordingly. -- This reverts f4c35609257156d0e32b8dd7315011b484919f05. The reason for the previous change does no longer apply. GnuPG-bug-id: 5951 --- lang/qt/src/refreshkeysjob.h | 2 +- lang/qt/tests/run-refreshkeysjob.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/qt/src/refreshkeysjob.h b/lang/qt/src/refreshkeysjob.h index 92b3b8f4..6bd748ac 100644 --- a/lang/qt/src/refreshkeysjob.h +++ b/lang/qt/src/refreshkeysjob.h @@ -88,7 +88,7 @@ public: virtual GpgME::Error start(const std::vector &keys) = 0; Q_SIGNALS: - void result(const GpgME::Error &result, const QString &auditLogAsHtml = {}, const GpgME::Error &auditLogError = {}); + void result(const GpgME::Error &result); }; } diff --git a/lang/qt/tests/run-refreshkeysjob.cpp b/lang/qt/tests/run-refreshkeysjob.cpp index 4c8f4086..aa9a6d62 100644 --- a/lang/qt/tests/run-refreshkeysjob.cpp +++ b/lang/qt/tests/run-refreshkeysjob.cpp @@ -140,7 +140,7 @@ int main(int argc, char **argv) std::cerr << "Error: Could not create job to refresh S/MIME key" << std::endl; return 1; } - QObject::connect(job, &QGpgME::RefreshKeysJob::result, &app, [](const GpgME::Error &err, const QString &, const GpgME::Error &) { + QObject::connect(job, &QGpgME::RefreshKeysJob::result, &app, [](const GpgME::Error &err) { std::cout << "Result: " << err.asString() << std::endl; qApp->quit(); });