From 60b96d149c71f7f5f928944e65732671d6b9eacc Mon Sep 17 00:00:00 2001 From: Ingo Klöcker Date: Thu, 13 Jun 2024 09:53:13 +0200 Subject: qt: Specify import options as list of strings instead of as string * lang/qt/src/importjob.cpp, lang/qt/src/importjob.h (setImportOptions): Change type of argument "options" to QStringList. (importOptions): Change return type to QStringList. * lang/qt/src/importjob_p.h (struct ImportJobPrivate): Change type of member m_importOptions to QStringList. * lang/qt/src/qgpgmeimportjob.cpp (import_qba): Change type of argument "importOptions" to QStringList. Join list of import options with ',' when setting the "import-options" context flag. * lang/qt/tests/t-import.cpp (ImportTest::testImportWithImportOptions): Adapt to API change. -- This makes the API that was introduced with the previous commit easier to use. GnuPG-bug-id: 7152 --- lang/qt/src/qgpgmeimportjob.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lang/qt/src/qgpgmeimportjob.cpp') diff --git a/lang/qt/src/qgpgmeimportjob.cpp b/lang/qt/src/qgpgmeimportjob.cpp index 0f90df42..650f0ade 100644 --- a/lang/qt/src/qgpgmeimportjob.cpp +++ b/lang/qt/src/qgpgmeimportjob.cpp @@ -106,14 +106,14 @@ static const char *originToString(Key::Origin origin) } static QGpgMEImportJob::result_type import_qba(Context *ctx, const QByteArray &certData, const QString &importFilter, - const QString &importOptions, Key::Origin keyOrigin, + const QStringList &importOptions, Key::Origin keyOrigin, const QString &keyOriginUrl) { if (!importFilter.isEmpty()) { ctx->setFlag("import-filter", importFilter.toStdString().c_str()); } - if (!importOptions.isEmpty()) { - ctx->setFlag("import-options", importOptions.toStdString().c_str()); + if (!importOptions.empty()) { + ctx->setFlag("import-options", importOptions.join(QLatin1Char{','}).toStdString().c_str()); } if (keyOrigin != Key::OriginUnknown) { if (const auto origin = originToString(keyOrigin)) { -- cgit