[Pkg-gnupg-commit] [gpgme] 28/132: qt: Add support for stringValueList in CryptoConf
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Apr 26 01:01:17 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gpgme.
commit 9640dc58e498966b482dcded6990cf4b47c556ac
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Thu Jan 12 12:57:00 2017 +0100
qt: Add support for stringValueList in CryptoConf
* lang/qt/src/Makefile.am (qgpgme_sources): Add cryptoconfig.cpp
* lang/qt/src/cryptoconfig.cpp: New.
* lang/qt/src/cryptoconfig.h (CryptoConfigEntry::stringValueList):
New.
* lang/qt/src/qgpgmenewcryptoconfig.cpp
(QGpgMENewCryptoConfigEntry::stringValueList): New.
* lang/qt/src/qgpgmenewcryptoconfig.h: Update accordingly.
--
This is a pardigm change in cryptoconfig.h to avoid ABI breaks
with each new config value we support it now has an implementation
that is directly related to qgpgmenewcryptoconfig, which is now
the only one.
---
NEWS | 1 +
lang/qt/src/Makefile.am | 2 +-
lang/qt/src/cryptoconfig.cpp | 44 +++++++++++++++++++++++++++++++++++
lang/qt/src/cryptoconfig.h | 9 +++++++
lang/qt/src/qgpgmenewcryptoconfig.cpp | 12 ++++++++++
lang/qt/src/qgpgmenewcryptoconfig.h | 2 ++
6 files changed, 69 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index c0ae27f..0fca77a 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Noteworthy changes in version 1.8.1 (unreleased)
cpp: Context::startAddUid(const Key&, const char*) NEW.
cpp: Key::UserID::revoke() NEW.
cpp: Key::addUid() NEW.
+ qt: CryptoConfig::stringValueList() NEW.
Noteworthy changes in version 1.8.0 (2016-11-16)
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index 55af1cf..c81461e 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -37,7 +37,7 @@ qgpgme_sources = \
qgpgmekeyformailboxjob.cpp gpgme_backend_debug.cpp \
qgpgmetofupolicyjob.cpp \
defaultkeygenerationjob.cpp qgpgmewkspublishjob.cpp \
- dn.cpp
+ dn.cpp cryptoconfig.cpp
# If you add one here make sure that you also add one in camelcase
qgpgme_headers= \
diff --git a/lang/qt/src/cryptoconfig.cpp b/lang/qt/src/cryptoconfig.cpp
new file mode 100644
index 0000000..be265d8
--- /dev/null
+++ b/lang/qt/src/cryptoconfig.cpp
@@ -0,0 +1,44 @@
+/*
+ cryptoconfig.cpp
+
+ This file is part of qgpgme, the Qt API binding for gpgme
+ Copyright (c) 2017 Intevation GmbH
+
+ 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 "cryptoconfig.h"
+#include "qgpgmenewcryptoconfig.h"
+
+using namespace QGpgME;
+
+QStringList CryptoConfigEntry::stringValueList() const
+{
+ const QGpgMENewCryptoConfigEntry *entry = dynamic_cast <const QGpgMENewCryptoConfigEntry*> (this);
+ if (!entry) {
+ return QStringList();
+ }
+ return entry->stringValueList();
+}
diff --git a/lang/qt/src/cryptoconfig.h b/lang/qt/src/cryptoconfig.h
index 452bfbb..c4de22d 100644
--- a/lang/qt/src/cryptoconfig.h
+++ b/lang/qt/src/cryptoconfig.h
@@ -248,6 +248,15 @@ public:
* @return true if the value was changed
*/
virtual bool isDirty() const = 0;
+
+ // Design change from here on we are closely bound to one implementation
+ // of cryptoconfig. To avoid ABI breaks with every new function we
+ // add real functions from now on.
+
+ /**
+ * @return a stringValueList.
+ */
+ QStringList stringValueList() const;
};
/**
diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp
index 49b27ca..4738a03 100644
--- a/lang/qt/src/qgpgmenewcryptoconfig.cpp
+++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp
@@ -546,6 +546,18 @@ std::vector<unsigned int> QGpgMENewCryptoConfigEntry::uintValueList() const
return m_option.currentValue().uintValues();
}
+QStringList QGpgMENewCryptoConfigEntry::stringValueList() const
+{
+ Q_ASSERT(isList());
+ const Argument arg = m_option.currentValue();
+ const std::vector<const char *> values = arg.stringValues();
+ QStringList ret;
+ for(const char *value: values) {
+ ret << QString::fromUtf8(value);
+ }
+ return ret;
+}
+
QList<QUrl> QGpgMENewCryptoConfigEntry::urlValueList() const
{
const Type type = m_option.type();
diff --git a/lang/qt/src/qgpgmenewcryptoconfig.h b/lang/qt/src/qgpgmenewcryptoconfig.h
index 81b4cb4..7100e70 100644
--- a/lang/qt/src/qgpgmenewcryptoconfig.h
+++ b/lang/qt/src/qgpgmenewcryptoconfig.h
@@ -93,6 +93,8 @@ public:
void setURLValueList(const QList<QUrl> &) Q_DECL_OVERRIDE;
bool isDirty() const Q_DECL_OVERRIDE;
+ QStringList stringValueList() const;
+
#if 0
void setDirty(bool b);
QString outputString() const;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git
More information about the Pkg-gnupg-commit
mailing list