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
This commit is contained in:
Ingo Klöcker
parent
bbaeeb5b9d
commit
ec8d1ee13f
@ -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 \
|
||||
|
||||
46
lang/qt/src/util.cpp
Normal file
46
lang/qt/src/util.cpp
Normal file
@ -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 <dev@ingo-kloecker.de>
|
||||
|
||||
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 <QStringList>
|
||||
|
||||
std::vector<std::string> toStrings(const QStringList &l)
|
||||
{
|
||||
std::vector<std::string> v;
|
||||
v.reserve(l.size());
|
||||
std::transform(std::begin(l), std::end(l),
|
||||
std::back_inserter(v),
|
||||
std::mem_fn(&QString::toStdString));
|
||||
return v;
|
||||
}
|
||||
51
lang/qt/src/util.h
Normal file
51
lang/qt/src/util.h
Normal file
@ -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 <dev@ingo-kloecker.de>
|
||||
|
||||
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 <gpgme.h>
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
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<std::string> toStrings(const QStringList &l);
|
||||
|
||||
#endif // __QGPGME_UTIL_H__
|
||||
Loading…
Reference in New Issue
Block a user