From ec8d1ee13fce21a1f52b084212827914dfcd0db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Wed, 2 Feb 2022 11:15:24 +0100 Subject: [PATCH] qt: Add helper for converting QStringList to vector of strings * lang/qt/src/util.h, lang/qt/src/util.cpp: New. * lang/qt/src/Makefile.am (qgpgme_sources, private_qgpgme_headers): Add new files. -- Additionally to the internal helper function toStrings(), this adds a copy of the internal make_error helper of GpgME++ which is used in a few places by QGpgME. We use the same error source id as GpgME++. GnuPG-bug-id: 5808 --- lang/qt/src/Makefile.am | 6 +++-- lang/qt/src/util.cpp | 46 +++++++++++++++++++++++++++++++++++++ lang/qt/src/util.h | 51 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 lang/qt/src/util.cpp create mode 100644 lang/qt/src/util.h diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am index c4f0e35f..51962f31 100644 --- a/lang/qt/src/Makefile.am +++ b/lang/qt/src/Makefile.am @@ -42,7 +42,8 @@ qgpgme_sources = \ qgpgmetofupolicyjob.cpp qgpgmequickjob.cpp \ defaultkeygenerationjob.cpp qgpgmewkspublishjob.cpp \ qgpgmegpgcardjob.cpp changeexpiryjob.cpp importjob.cpp \ - dn.cpp cryptoconfig.cpp wkdlookupresult.cpp + dn.cpp cryptoconfig.cpp wkdlookupresult.cpp \ + util.cpp # If you add one here make sure that you also add one in camelcase qgpgme_headers= \ @@ -165,7 +166,8 @@ private_qgpgme_headers = \ qgpgmetofupolicyjob.h \ qgpgmegpgcardjob.h \ qgpgmequickjob.h \ - threadedjobmixin.h + threadedjobmixin.h \ + util.h qgpgme_moc_sources = \ abstractimportjob.moc \ diff --git a/lang/qt/src/util.cpp b/lang/qt/src/util.cpp new file mode 100644 index 00000000..9487b7b3 --- /dev/null +++ b/lang/qt/src/util.cpp @@ -0,0 +1,46 @@ +/* + util.cpp + + This file is part of qgpgme, the Qt API binding for gpgme + Copyright (c) 2022 g10 Code GmbH + Software engineering by Ingo Klöcker + + QGpgME is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + QGpgME is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#include "util.h" + +#include + +std::vector toStrings(const QStringList &l) +{ + std::vector v; + v.reserve(l.size()); + std::transform(std::begin(l), std::end(l), + std::back_inserter(v), + std::mem_fn(&QString::toStdString)); + return v; +} diff --git a/lang/qt/src/util.h b/lang/qt/src/util.h new file mode 100644 index 00000000..94c97333 --- /dev/null +++ b/lang/qt/src/util.h @@ -0,0 +1,51 @@ +/* + util.h - some internal helpers + + This file is part of qgpgme, the Qt API binding for gpgme + Copyright (c) 2022 g10 Code GmbH + Software engineering by Ingo Klöcker + + QGpgME is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + QGpgME is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the copyright holders give + permission to link the code of this program with any edition of + the Qt library by Trolltech AS, Norway (or with modified versions + of Qt that use the same license as Qt), and distribute linked + combinations including the two. You must obey the GNU General + Public License in all respects for all of the code used other than + Qt. If you modify this file, you may extend this exception to + your version of the file, but you are not obligated to do so. If + you do not wish to do so, delete this exception statement from + your version. +*/ + +#ifndef __QGPGME_UTIL_H__ +#define __QGPGME_UTIL_H__ + +#include + +#include +#include + +class QStringList; + +static inline gpgme_error_t make_error(gpgme_err_code_t code) +{ + return gpgme_err_make((gpgme_err_source_t)22, code); +} + +std::vector toStrings(const QStringList &l); + +#endif // __QGPGME_UTIL_H__