From 690d967196d9f888e2b7c12d8c77ad752d7e15bf Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Thu, 16 Jul 2020 17:00:28 +0200 Subject: qt, cpp: Support export modes * lang/cpp/context.cpp, lang/cpp/context.h (Context::startPublicKeyExport, Context::exportPublicKeys): Extend with flags paramenter. (Context::ExportMode): New. * lang/qt/src/exportjob.h (ExportJob::setExportMode): New. * lang/qt/src/qgpgmeexportjob.cpp, lang/qt/src/qgpgmeexportjob.h: Update accordingly. -- This adds the C++ and Qt API for export modes. --- lang/cpp/src/context.cpp | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) (limited to 'lang/cpp/src/context.cpp') diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp index 002b20f5..2560a338 100644 --- a/lang/cpp/src/context.cpp +++ b/lang/cpp/src/context.cpp @@ -563,44 +563,66 @@ KeyGenerationResult Context::keyGenerationResult() const } } -Error Context::exportPublicKeys(const char *pattern, Data &keyData) +Error Context::exportPublicKeys(const char *pattern, Data &keyData, unsigned int flags) { d->lastop = Private::Export; Data::Private *const dp = keyData.impl(); - return Error(d->lasterr = gpgme_op_export(d->ctx, pattern, 0, dp ? dp->data : nullptr)); + return Error(d->lasterr = gpgme_op_export(d->ctx, pattern, flags, dp ? dp->data : nullptr)); } -Error Context::exportPublicKeys(const char *patterns[], Data &keyData) +Error Context::exportPublicKeys(const char *patterns[], Data &keyData, unsigned int flags) { d->lastop = Private::Export; #ifndef HAVE_GPGME_EXT_KEYLIST_MODE_EXTERNAL_NONBROKEN if (!patterns || !patterns[0] || !patterns[1]) { // max. one pattern -> use the non-ext version - return exportPublicKeys(patterns ? patterns[0] : nullptr, keyData); + return exportPublicKeys(patterns ? patterns[0] : nullptr, keyData, flags); } #endif Data::Private *const dp = keyData.impl(); - return Error(d->lasterr = gpgme_op_export_ext(d->ctx, patterns, 0, dp ? dp->data : nullptr)); + return Error(d->lasterr = gpgme_op_export_ext(d->ctx, patterns, flags, dp ? dp->data : nullptr)); } -Error Context::startPublicKeyExport(const char *pattern, Data &keyData) +Error Context::startPublicKeyExport(const char *pattern, Data &keyData, unsigned int flags) { d->lastop = Private::Export; Data::Private *const dp = keyData.impl(); - return Error(d->lasterr = gpgme_op_export_start(d->ctx, pattern, 0, dp ? dp->data : nullptr)); + return Error(d->lasterr = gpgme_op_export_start(d->ctx, pattern, flags, dp ? dp->data : nullptr)); } -Error Context::startPublicKeyExport(const char *patterns[], Data &keyData) +Error Context::startPublicKeyExport(const char *patterns[], Data &keyData, unsigned int flags) { d->lastop = Private::Export; #ifndef HAVE_GPGME_EXT_KEYLIST_MODE_EXTERNAL_NONBROKEN if (!patterns || !patterns[0] || !patterns[1]) { // max. one pattern -> use the non-ext version - return startPublicKeyExport(patterns ? patterns[0] : nullptr, keyData); + return startPublicKeyExport(patterns ? patterns[0] : nullptr, keyData, flags); } #endif Data::Private *const dp = keyData.impl(); - return Error(d->lasterr = gpgme_op_export_ext_start(d->ctx, patterns, 0, dp ? dp->data : nullptr)); + return Error(d->lasterr = gpgme_op_export_ext_start(d->ctx, patterns, flags, dp ? dp->data : nullptr)); +} + + +/* Same as above but without flags */ +Error Context::exportPublicKeys(const char *pattern, Data &keyData) +{ + return exportPublicKeys(pattern, keyData, 0); +} + +Error Context::exportPublicKeys(const char *patterns[], Data &keyData) +{ + return exportPublicKeys(patterns, keyData, 0); +} + +Error Context::startPublicKeyExport(const char *pattern, Data &keyData) +{ + return startPublicKeyExport(pattern, keyData, 0); +} + +Error Context::startPublicKeyExport(const char *patterns[], Data &keyData) +{ + return startPublicKeyExport(patterns, keyData, 0); } ImportResult Context::importKeys(const Data &data) -- cgit v1.2.3