[git] GPGME - branch, gpgmepp, updated. gpgme-1.6.0-33-gfaf987d
by Andre Heinecke
cvs at cvs.gnupg.org
Sun Apr 3 11:51:27 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".
The branch, gpgmepp has been updated
via faf987dd62893955251378a2a715edd2892a540c (commit)
via b7b9e38399a572cb61a297db552026eac5b2a5e1 (commit)
via 0cc9006dbc59d87c6bcda88b36d59dcb69ac35cb (commit)
via 3e38cc6fc67c420dec3e9e8afd072b4c8a157c85 (commit)
via 7071b2a9c00b85d434d01b6166269ebf48b01b81 (commit)
via 63c115b067400e1b02c7d849c99f54dc9f394d68 (commit)
via 576be46f34b42e896a5e3be65560a4b518a758be (commit)
from a440050fc2c11e4867da9d4707616fa23ac52141 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit faf987dd62893955251378a2a715edd2892a540c
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sun Apr 3 01:48:46 2016 -0800
Qt: Add a unit test for qgpgme
* configure.ac: Configure test Makefile.
* m4/qt.m4: Look up Qt5Test flags.
* lang/qt/tests/t-keylist.cpp: New. Simple keylist check.
* lang/qt/tests/Makefile.am: New. General test framework.
--
This test mostly checks that it basically compiles / works and
adds a test framework.
diff --git a/configure.ac b/configure.ac
index 9dd02e6..8580be7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -678,6 +678,7 @@ AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfigVersion.cmake)
AC_CONFIG_FILES(lang/qt/Makefile lang/qt/src/Makefile)
AC_CONFIG_FILES(lang/qt/src/QGpgmeConfig.cmake.in)
AC_CONFIG_FILES(lang/qt/src/QGpgmeConfigVersion.cmake)
+AC_CONFIG_FILES(lang/qt/tests/Makefile)
AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
AC_OUTPUT
diff --git a/lang/qt/Makefile.am b/lang/qt/Makefile.am
index 7fbaca8..48f568a 100644
--- a/lang/qt/Makefile.am
+++ b/lang/qt/Makefile.am
@@ -18,6 +18,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA
-SUBDIRS = src
+SUBDIRS = src tests
EXTRA_DIST = README
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
new file mode 100644
index 0000000..3b483fe
--- /dev/null
+++ b/lang/qt/tests/Makefile.am
@@ -0,0 +1,66 @@
+# Makefile.am - Makefile for GPGME Qt tests.
+# Copyright (C) 2016 Intevation GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+#
+# GPGME 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 Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+## Process this file with automake to produce Makefile.in
+
+GPG = gpg
+
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
+
+TESTS = t-keylist
+
+moc_files = t-keylist.moc
+
+AM_LDFLAGS = -no-install
+
+LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
+ ../../../src/libgpgme.la @GPGME_QT_LIBS@ @GPG_ERROR_LIBS@ \
+ @GPGME_QTTEST_LIBS@
+
+AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@ \
+ @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
+ @GPGME_QTTEST_CFLAGS@ \
+ -I$(top_srcdir)/lang/cpp/src -I$(top_srcdir)/lang/qt/src \
+ -DTOP_SRCDIR="$(top_srcdir)"
+
+check-local: ./t-keylist ./pubring-stamp
+
+t_keylist_SOURCES = t-keylist.cpp t-keylist.h
+
+nodist_t_keylist_SOURCES = $(moc_files)
+
+BUILT_SOURCES = $(moc_files)
+
+noinst_PROGRAMS = t-keylist
+
+CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
+ gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
+ random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp $(moc_files)
+
+export GNUPGHOME := $(abs_builddir)
+
+./pubring-stamp: $(top_srcdir)/tests/gpg/pubdemo.asc \
+ $(top_srcdir)/tests/gpg/secdemo.asc
+ $(GPG) --no-permission-warning \
+ --import $(top_srcdir)/tests/gpg/pubdemo.asc
+ -$(GPG) --no-permission-warning \
+ --import $(top_srcdir)/tests/gpg/secdemo.asc
+ touch ./pubring-stamp
+
+.cpp.moc:
+ $(MOC) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
diff --git a/lang/qt/tests/t-keylist.cpp b/lang/qt/tests/t-keylist.cpp
new file mode 100644
index 0000000..67ace7f
--- /dev/null
+++ b/lang/qt/tests/t-keylist.cpp
@@ -0,0 +1,31 @@
+#include <QDebug>
+#include <QTest>
+#include "keylistjob.h"
+#include "qgpgmebackend.h"
+#include "keylistresult.h"
+
+using namespace QGpgME;
+
+class KeyListTest : public QObject
+{
+ Q_OBJECT
+
+private Q_SLOTS:
+
+ void testSingleKeyListSync()
+ {
+ QGpgMEBackend backend;
+ KeyListJob *job = backend.openpgp()->keyListJob(false, false, false);
+ std::vector<GpgME::Key> keys;
+ GpgME::KeyListResult result = job->exec(QStringList() << QStringLiteral("alfa at example.net"),
+ false, keys);
+ Q_ASSERT (!result.error());
+ Q_ASSERT (keys.size() == 1);
+ const QString kId = QLatin1String(keys.front().keyID());
+ Q_ASSERT (kId == QStringLiteral("2D727CC768697734"));
+ }
+};
+
+QTEST_MAIN(KeyListTest)
+
+#include "t-keylist.moc"
diff --git a/m4/qt.m4 b/m4/qt.m4
index 80e2245..d3be7f8 100644
--- a/m4/qt.m4
+++ b/m4/qt.m4
@@ -18,6 +18,11 @@ AC_DEFUN([FIND_QT],
[have_qt5_libs="yes"],
[have_qt5_libs="no"])
+ PKG_CHECK_MODULES(GPGME_QTTEST,
+ Qt5Test >= 5.0.0,
+ [have_qt5test_libs="yes"],
+ [have_qt5test_libs="no"])
+
if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
GPGME_QT_CFLAGS="$GPGME_QT_CFLAGS -fpic"
fi
commit b7b9e38399a572cb61a297db552026eac5b2a5e1
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sun Apr 3 01:33:52 2016 -0800
Qt: Add missing MOC includes
* qgpgmeadduseridjob.cpp,
qgpgmechangeexpiryjob.cpp,
qgpgmechangeownertrustjob.cpp,
qgpgmechangepasswdjob.cpp,
qgpgmedecryptjob.cpp,
qgpgmedecryptverifyjob.cpp,
qgpgmedeletejob.cpp,
qgpgmedownloadjob.cpp,
qgpgmeencryptjob.cpp,
qgpgmeexportjob.cpp,
qgpgmeimportfromkeyserverjob.cpp,
qgpgmeimportjob.cpp,
qgpgmekeygenerationjob.cpp,
qgpgmekeylistjob.cpp,
qgpgmelistallkeysjob.cpp,
qgpgmerefreshkeysjob.cpp,
qgpgmesecretkeyexportjob.cpp,
qgpgmesignencryptjob.cpp,
qgpgmesignjob.cpp,
qgpgmesignkeyjob.cpp,
qgpgmeverifydetachedjob.cpp,
qgpgmeverifyopaquejob.cpp: Add missing MOC includes.
--
In the CMake world this was handled by cmake automoc
suppport and not neccessary.
diff --git a/lang/qt/src/qgpgmeadduseridjob.cpp b/lang/qt/src/qgpgmeadduseridjob.cpp
index 19127a8..03e8f20 100644
--- a/lang/qt/src/qgpgmeadduseridjob.cpp
+++ b/lang/qt/src/qgpgmeadduseridjob.cpp
@@ -80,3 +80,4 @@ Error QGpgMEAddUserIDJob::start(const Key &key, const QString &name, const QStri
run(bind(&add_user_id, _1, key, name, email, comment));
return Error();
}
+#include "qgpgmeadduseridjob.moc"
diff --git a/lang/qt/src/qgpgmechangeexpiryjob.cpp b/lang/qt/src/qgpgmechangeexpiryjob.cpp
index ac06d8d..41fe8c3 100644
--- a/lang/qt/src/qgpgmechangeexpiryjob.cpp
+++ b/lang/qt/src/qgpgmechangeexpiryjob.cpp
@@ -79,3 +79,4 @@ Error QGpgMEChangeExpiryJob::start(const Key &key, const QDateTime &expiry)
run(bind(&change_expiry, _1, key, expiry));
return Error();
}
+#include "qgpgmechangeexpiryjob.moc"
diff --git a/lang/qt/src/qgpgmechangeownertrustjob.cpp b/lang/qt/src/qgpgmechangeownertrustjob.cpp
index 3e4144d..09b9539 100644
--- a/lang/qt/src/qgpgmechangeownertrustjob.cpp
+++ b/lang/qt/src/qgpgmechangeownertrustjob.cpp
@@ -75,3 +75,4 @@ Error QGpgMEChangeOwnerTrustJob::start(const Key &key, Key::OwnerTrust trust)
run(bind(&change_ownertrust, _1, key, trust));
return Error();
}
+#include "qgpgmechangeownertrustjob.moc"
diff --git a/lang/qt/src/qgpgmechangepasswdjob.cpp b/lang/qt/src/qgpgmechangepasswdjob.cpp
index 4e5f6e3..a182214 100644
--- a/lang/qt/src/qgpgmechangepasswdjob.cpp
+++ b/lang/qt/src/qgpgmechangepasswdjob.cpp
@@ -76,3 +76,5 @@ Error QGpgMEChangePasswdJob::start(const Key &key)
run(bind(&change_passwd, _1, key));
return Error();
}
+
+#include "qgpgmechangepasswdjob.moc"
diff --git a/lang/qt/src/qgpgmedecryptjob.cpp b/lang/qt/src/qgpgmedecryptjob.cpp
index f084e2a..9ce4181 100644
--- a/lang/qt/src/qgpgmedecryptjob.cpp
+++ b/lang/qt/src/qgpgmedecryptjob.cpp
@@ -125,3 +125,5 @@ void QGpgMEDecryptJob::resultHook(const result_type &tuple)
{
mResult = get<0>(tuple);
}
+
+#include "qgpgmedecryptjob.moc"
diff --git a/lang/qt/src/qgpgmedecryptverifyjob.cpp b/lang/qt/src/qgpgmedecryptverifyjob.cpp
index 635511e..7e6c4b5 100644
--- a/lang/qt/src/qgpgmedecryptverifyjob.cpp
+++ b/lang/qt/src/qgpgmedecryptverifyjob.cpp
@@ -133,3 +133,4 @@ void QGpgMEDecryptVerifyJob::resultHook(const result_type &tuple)
{
mResult = std::make_pair(get<0>(tuple), get<1>(tuple));
}
+#include "qgpgmedecryptverifyjob.moc"
diff --git a/lang/qt/src/qgpgmedeletejob.cpp b/lang/qt/src/qgpgmedeletejob.cpp
index c5f5253..8ec4f0a 100644
--- a/lang/qt/src/qgpgmedeletejob.cpp
+++ b/lang/qt/src/qgpgmedeletejob.cpp
@@ -63,3 +63,4 @@ Error QGpgMEDeleteJob::start(const Key &key, bool allowSecretKeyDeletion)
run(bind(&delete_key, _1, key, allowSecretKeyDeletion));
return Error();
}
+#include "qgpgmedeletejob.moc"
diff --git a/lang/qt/src/qgpgmedownloadjob.cpp b/lang/qt/src/qgpgmedownloadjob.cpp
index 3baa629..f46f428 100644
--- a/lang/qt/src/qgpgmedownloadjob.cpp
+++ b/lang/qt/src/qgpgmedownloadjob.cpp
@@ -100,3 +100,4 @@ Error QGpgMEDownloadJob::start(const QByteArray &fpr, const boost::shared_ptr<QI
run(bind(&download, _1, _2, fpr, _3), keyData);
return Error();
}
+#include "qgpgmedownloadjob.moc"
diff --git a/lang/qt/src/qgpgmeencryptjob.cpp b/lang/qt/src/qgpgmeencryptjob.cpp
index 4618e4a..97406dd 100644
--- a/lang/qt/src/qgpgmeencryptjob.cpp
+++ b/lang/qt/src/qgpgmeencryptjob.cpp
@@ -159,3 +159,4 @@ void QGpgMEEncryptJob::showErrorDialog(QWidget *parent, const QString &caption)
}
}
#endif
+#include "qgpgmeencryptjob.moc"
diff --git a/lang/qt/src/qgpgmeexportjob.cpp b/lang/qt/src/qgpgmeexportjob.cpp
index 12bbfd2..d3a390e 100644
--- a/lang/qt/src/qgpgmeexportjob.cpp
+++ b/lang/qt/src/qgpgmeexportjob.cpp
@@ -74,3 +74,4 @@ Error QGpgMEExportJob::start(const QStringList &patterns)
run(bind(&export_qba, _1, patterns));
return Error();
}
+#include "qgpgmeexportjob.moc"
diff --git a/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp b/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp
index 846ebee..ecf7879 100644
--- a/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp
+++ b/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp
@@ -80,3 +80,4 @@ void QGpgME::QGpgMEImportFromKeyserverJob::resultHook(const result_type &tuple)
{
mResult = get<0>(tuple);
}
+#include "qgpgmeimportfromkeyserverjob.moc"
diff --git a/lang/qt/src/qgpgmeimportjob.cpp b/lang/qt/src/qgpgmeimportjob.cpp
index 973a0bf..0e44cbe 100644
--- a/lang/qt/src/qgpgmeimportjob.cpp
+++ b/lang/qt/src/qgpgmeimportjob.cpp
@@ -83,3 +83,4 @@ void QGpgME::QGpgMEImportJob::resultHook(const result_type &tuple)
{
mResult = get<0>(tuple);
}
+#include "qgpgmeimportjob.moc"
diff --git a/lang/qt/src/qgpgmekeygenerationjob.cpp b/lang/qt/src/qgpgmekeygenerationjob.cpp
index 56323c9..fc7cf15 100644
--- a/lang/qt/src/qgpgmekeygenerationjob.cpp
+++ b/lang/qt/src/qgpgmekeygenerationjob.cpp
@@ -69,3 +69,4 @@ Error QGpgMEKeyGenerationJob::start(const QString ¶meters)
run(bind(&generate_key, _1, parameters));
return Error();
}
+#include "qgpgmekeygenerationjob.moc"
diff --git a/lang/qt/src/qgpgmekeylistjob.cpp b/lang/qt/src/qgpgmekeylistjob.cpp
index 6059941..2af45fe 100644
--- a/lang/qt/src/qgpgmekeylistjob.cpp
+++ b/lang/qt/src/qgpgmekeylistjob.cpp
@@ -165,3 +165,4 @@ void QGpgMEKeyListJob::showErrorDialog(QWidget *parent, const QString &caption)
KMessageBox::error(parent, msg, caption);
}
#endif
+#include "qgpgmekeylistjob.moc"
diff --git a/lang/qt/src/qgpgmelistallkeysjob.cpp b/lang/qt/src/qgpgmelistallkeysjob.cpp
index a51231f..4f98d34 100644
--- a/lang/qt/src/qgpgmelistallkeysjob.cpp
+++ b/lang/qt/src/qgpgmelistallkeysjob.cpp
@@ -168,3 +168,4 @@ void QGpgMEListAllKeysJob::showErrorDialog(QWidget *parent, const QString &capti
KMessageBox::error(parent, msg, caption);
}
#endif
+#include "qgpgmelistallkeysjob.moc"
diff --git a/lang/qt/src/qgpgmerefreshkeysjob.cpp b/lang/qt/src/qgpgmerefreshkeysjob.cpp
index 2a35b23..67b0a14 100644
--- a/lang/qt/src/qgpgmerefreshkeysjob.cpp
+++ b/lang/qt/src/qgpgmerefreshkeysjob.cpp
@@ -222,3 +222,4 @@ void QGpgME::QGpgMERefreshKeysJob::slotProcessExited(int exitCode, QProcess::Exi
Q_EMIT result(mError);
deleteLater();
}
+#include "qgpgmerefreshkeysjob.moc"
diff --git a/lang/qt/src/qgpgmesecretkeyexportjob.cpp b/lang/qt/src/qgpgmesecretkeyexportjob.cpp
index 9fd3ffe..3c330b0 100644
--- a/lang/qt/src/qgpgmesecretkeyexportjob.cpp
+++ b/lang/qt/src/qgpgmesecretkeyexportjob.cpp
@@ -139,3 +139,4 @@ void QGpgME::QGpgMESecretKeyExportJob::slotProcessExited(int exitCode, QProcess:
Q_EMIT result(mError, mKeyData);
deleteLater();
}
+#include "qgpgmesecretkeyexportjob.moc"
diff --git a/lang/qt/src/qgpgmesignencryptjob.cpp b/lang/qt/src/qgpgmesignencryptjob.cpp
index 1712b38..7c184c6 100644
--- a/lang/qt/src/qgpgmesignencryptjob.cpp
+++ b/lang/qt/src/qgpgmesignencryptjob.cpp
@@ -158,3 +158,4 @@ void QGpgMESignEncryptJob::resultHook(const result_type &tuple)
{
mResult = std::make_pair(get<0>(tuple), get<1>(tuple));
}
+#include "qgpgmesignencryptjob.moc"
diff --git a/lang/qt/src/qgpgmesignjob.cpp b/lang/qt/src/qgpgmesignjob.cpp
index 5d8ae85..3fdf3e6 100644
--- a/lang/qt/src/qgpgmesignjob.cpp
+++ b/lang/qt/src/qgpgmesignjob.cpp
@@ -162,3 +162,4 @@ void QGpgMESignJob::showErrorDialog(QWidget *parent, const QString &caption) con
}
}
#endif
+#include "qgpgmesignjob.moc"
diff --git a/lang/qt/src/qgpgmesignkeyjob.cpp b/lang/qt/src/qgpgmesignkeyjob.cpp
index c6bbe2c..d683e53 100644
--- a/lang/qt/src/qgpgmesignkeyjob.cpp
+++ b/lang/qt/src/qgpgmesignkeyjob.cpp
@@ -125,3 +125,4 @@ void QGpgMESignKeyJob::setNonRevocable(bool nonRevocable)
assert(!m_started);
m_nonRevocable = nonRevocable;
}
+#include "qgpgmesignkeyjob.moc"
diff --git a/lang/qt/src/qgpgmeverifydetachedjob.cpp b/lang/qt/src/qgpgmeverifydetachedjob.cpp
index 5122835..3d65242 100644
--- a/lang/qt/src/qgpgmeverifydetachedjob.cpp
+++ b/lang/qt/src/qgpgmeverifydetachedjob.cpp
@@ -117,3 +117,4 @@ void QGpgME::QGpgMEVerifyDetachedJob::resultHook(const result_type &tuple)
{
mResult = get<0>(tuple);
}
+#include "qgpgmeverifydetachedjob.moc"
diff --git a/lang/qt/src/qgpgmeverifyopaquejob.cpp b/lang/qt/src/qgpgmeverifyopaquejob.cpp
index fd5b708..fc5c1f2 100644
--- a/lang/qt/src/qgpgmeverifyopaquejob.cpp
+++ b/lang/qt/src/qgpgmeverifyopaquejob.cpp
@@ -124,3 +124,4 @@ void QGpgME::QGpgMEVerifyOpaqueJob::resultHook(const result_type &tuple)
{
mResult = get<0>(tuple);
}
+#include "qgpgmeverifyopaquejob.moc"
commit 0cc9006dbc59d87c6bcda88b36d59dcb69ac35cb
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sun Apr 3 01:30:57 2016 -0800
Qt: Declare pure virtuals as such
* lang/qt/src/qgpgmebackend.h (Protocol): Make all functions
pure virtual.
--
Fixes errors when linking with QGpgME.
diff --git a/lang/qt/src/qgpgmebackend.h b/lang/qt/src/qgpgmebackend.h
index 962a4d9..d442fa5 100644
--- a/lang/qt/src/qgpgmebackend.h
+++ b/lang/qt/src/qgpgmebackend.h
@@ -139,11 +139,11 @@ public:
virtual SignEncryptJob *signEncryptJob(bool armor = false, bool textMode = false) const = 0;
virtual DecryptVerifyJob *decryptVerifyJob(bool textmode = false) const = 0;
virtual RefreshKeysJob *refreshKeysJob() const = 0;
- virtual ChangeExpiryJob *changeExpiryJob() const;
- virtual ChangeOwnerTrustJob *changeOwnerTrustJob() const;
- virtual ChangePasswdJob *changePasswdJob() const;
- virtual SignKeyJob *signKeyJob() const;
- virtual AddUserIDJob *addUserIDJob() const;
+ virtual ChangeExpiryJob *changeExpiryJob() const = 0;
+ virtual SignKeyJob *signKeyJob() const = 0;
+ virtual ChangePasswdJob *changePasswdJob() const = 0;
+ virtual ChangeOwnerTrustJob *changeOwnerTrustJob() const = 0;
+ virtual AddUserIDJob *addUserIDJob() const = 0;
virtual SpecialJob *specialJob(const char *type, const QMap<QString, QVariant> &args) const = 0;
};
commit 3e38cc6fc67c420dec3e9e8afd072b4c8a157c85
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sun Apr 3 01:27:58 2016 -0800
Qt: Don't declare showErrorDialog anymore
* cpp/qt/src/job.h: Remove showErrorDialog.
--
If additional error handling is neccessary emitting
signals to a gui application would be better API for qgpgme.
diff --git a/lang/qt/src/job.h b/lang/qt/src/job.h
index caa840b..0882539 100644
--- a/lang/qt/src/job.h
+++ b/lang/qt/src/job.h
@@ -75,8 +75,6 @@ protected:
public:
~Job();
- virtual void showErrorDialog(QWidget *parent = Q_NULLPTR, const QString &caption = QString()) const;
-
virtual QString auditLogAsHtml() const;
virtual GpgME::Error auditLogError() const;
bool isAuditLogSupported() const;
commit 7071b2a9c00b85d434d01b6166269ebf48b01b81
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sun Apr 3 01:22:19 2016 -0800
Qt: Only use GpgME based config class
* lang/qt/src/qgpgmecryptoconfig.cpp,
lang/qt/src/qgpgmecryptoconfig.h: Removed.
* lang/qt/src/qgpgmebackend.cpp: Return newcryptoconfig.
--
The GpgME based config class is the way forward and the
old class was using KDE Code. Probably needs some bugfixes
as previously the new class was only used for Windows CE
diff --git a/lang/qt/src/qgpgmebackend.cpp b/lang/qt/src/qgpgmebackend.cpp
index ac77124..1167dae 100644
--- a/lang/qt/src/qgpgmebackend.cpp
+++ b/lang/qt/src/qgpgmebackend.cpp
@@ -33,7 +33,6 @@
#include "qgpgmebackend.h"
-#include "qgpgmecryptoconfig.h"
#include "qgpgmenewcryptoconfig.h"
#include "qgpgmekeygenerationjob.h"
@@ -408,14 +407,9 @@ QString QGpgME::QGpgMEBackend::displayName() const
QGpgME::CryptoConfig *QGpgME::QGpgMEBackend::config() const
{
if (!mCryptoConfig) {
-#ifdef _WIN32_WCE // for now...
if (GpgME::hasFeature(GpgME::GpgConfEngineFeature, 0)) {
mCryptoConfig = new QGpgMENewCryptoConfig;
- } else
-#endif
- if (!QGpgMECryptoConfig::gpgConfPath().isEmpty()) {
- mCryptoConfig = new QGpgMECryptoConfig();
- }
+ }
}
return mCryptoConfig;
}
diff --git a/lang/qt/src/qgpgmecryptoconfig.cpp b/lang/qt/src/qgpgmecryptoconfig.cpp
deleted file mode 100644
index fe3e54f..0000000
--- a/lang/qt/src/qgpgmecryptoconfig.cpp
+++ /dev/null
@@ -1,948 +0,0 @@
-/*
- qgpgmecryptoconfig.cpp
-
- This file is part of qgpgme, the Qt API binding for gpgme
- Copyright (c) 2004 Klarälvdalens Datakonsult AB
- Copyright (c) 2016 Intevation GmbH
-
- Libkleopatra 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.
-
- Libkleopatra 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 "qgpgmecryptoconfig.h"
-
-#include <QList>
-#include <QByteArray>
-#include <errno.h>
-#include "gpgme_backend_debug.h"
-
-#include "engineinfo.h"
-#include "global.h"
-
-#include <cassert>
-#include <QTemporaryFile>
-#include <QFile>
-#include <cstdlib>
-#include <iterator>
-#include <QStandardPaths>
-
-// Just for the Q_ASSERT in the dtor. Not thread-safe, but who would
-// have 2 threads talking to gpgconf anyway? :)
-static bool s_duringClear = false;
-
-static const int GPGCONF_FLAG_GROUP = 1;
-static const int GPGCONF_FLAG_OPTIONAL = 2;
-static const int GPGCONF_FLAG_LIST = 4;
-static const int GPGCONF_FLAG_RUNTIME = 8;
-static const int GPGCONF_FLAG_DEFAULT = 16; // fixed default value available
-//static const int GPGCONF_FLAG_DEFAULT_DESC = 32; // runtime default value available
-//static const int GPGCONF_FLAG_NOARG_DESC = 64; // option with optional arg; special meaning if no arg set
-static const int GPGCONF_FLAG_NO_CHANGE = 128; // readonly
-// Change size of mFlags bitfield if adding new values here
-
-QString QGpgMECryptoConfig::gpgConfPath()
-{
- const GpgME::EngineInfo info = GpgME::engineInfo(GpgME::GpgConfEngine);
- return info.fileName() ? QFile::decodeName(info.fileName()) : QStandardPaths::findExecutable(QStringLiteral("gpgconf"));
-}
-
-QGpgMECryptoConfig::QGpgMECryptoConfig()
- : mParsed(false)
-{
-}
-
-QGpgMECryptoConfig::~QGpgMECryptoConfig()
-{
- clear();
-}
-
-void QGpgMECryptoConfig::runGpgConf(bool showErrors)
-{
- // Run gpgconf --list-components to make the list of components
- KProcess process;
-
- process << gpgConfPath();
- process << QStringLiteral("--list-components");
-
- connect(&process, &KProcess::readyReadStandardOutput, this, &QGpgMECryptoConfig::slotCollectStdOut);
-
- // run the process:
- int rc = 0;
- process.setOutputChannelMode(KProcess::OnlyStdoutChannel);
- process.start();
- if (!process.waitForFinished()) {
- rc = -2;
- } else if (process.exitStatus() == QProcess::NormalExit) {
- rc = process.exitCode();
- } else {
- rc = -1;
- }
-
- // handle errors, if any (and if requested)
- if (showErrors && rc != 0) {
- QString reason;
- if (rc == -1) {
- reason = i18n("program terminated unexpectedly");
- } else if (rc == -2) {
- reason = i18n("program not found or cannot be started");
- } else {
- reason = QString::fromLocal8Bit(strerror(rc)); // XXX errno as an exit code?
- }
- QString wmsg = i18n("<qt>Failed to execute gpgconf:<p>%1</p></qt>", reason);
- qCWarning(GPGPME_BACKEND_LOG) << wmsg; // to see it from test_cryptoconfig.cpp
- KMessageBox::error(0, wmsg);
- }
- mParsed = true;
-}
-
-void QGpgMECryptoConfig::slotCollectStdOut()
-{
- assert(qobject_cast<KProcess *>(QObject::sender()));
- KProcess *const proc = static_cast<KProcess *>(QObject::sender());
- while (proc->canReadLine()) {
- QString line = QString::fromUtf8(proc->readLine());
- if (line.endsWith(QLatin1Char('\n'))) {
- line.chop(1);
- }
- if (line.endsWith(QLatin1Char('\r'))) {
- line.chop(1);
- }
- //qCDebug(GPGPME_BACKEND_LOG) <<"GOT LINE:" << line;
- // Format: NAME:DESCRIPTION
- const QStringList lst = line.split(QLatin1Char(':'));
- if (lst.count() >= 2) {
- const std::pair<QString, QGpgMECryptoConfigComponent *> pair(lst[0], new QGpgMECryptoConfigComponent(this, lst[0], lst[1]));
- mComponentsNaturalOrder.push_back(pair);
- mComponentsByName[pair.first] = pair.second;
- } else {
- qCWarning(GPGPME_BACKEND_LOG) << "Parse error on gpgconf --list-components output:" << line;
- }
- }
-}
-
-namespace
-{
-struct Select1St {
- template <typename U, typename V>
- const U &operator()(const std::pair<U, V> &p) const
- {
- return p.first;
- }
- template <typename U, typename V>
- const U &operator()(const QPair<U, V> &p) const
- {
- return p.first;
- }
-};
-}
-
-QStringList QGpgMECryptoConfig::componentList() const
-{
- if (!mParsed) {
- const_cast<QGpgMECryptoConfig *>(this)->runGpgConf(true);
- }
- QStringList result;
- std::transform(mComponentsNaturalOrder.begin(), mComponentsNaturalOrder.end(),
- std::back_inserter(result), Select1St());
- return result;
-}
-
-QGpgME::CryptoConfigComponent *QGpgMECryptoConfig::component(const QString &name) const
-{
- if (!mParsed) {
- const_cast<QGpgMECryptoConfig *>(this)->runGpgConf(false);
- }
- return mComponentsByName.value(name);
-}
-
-void QGpgMECryptoConfig::sync(bool runtime)
-{
- Q_FOREACH (QGpgMECryptoConfigComponent *it, mComponentsByName) {
- it->sync(runtime);
- }
-}
-
-void QGpgMECryptoConfig::clear()
-{
- s_duringClear = true;
- mComponentsNaturalOrder.clear();
- qDeleteAll(mComponentsByName);
- mComponentsByName.clear();
- s_duringClear = false;
- mParsed = false; // next call to componentList/component will need to run gpgconf again
-}
-
-////
-
-QGpgMECryptoConfigComponent::QGpgMECryptoConfigComponent(QGpgMECryptoConfig *, const QString &name, const QString &description)
- : mName(name), mDescription(description)
-{
- runGpgConf();
-}
-
-QGpgMECryptoConfigComponent::~QGpgMECryptoConfigComponent()
-{
- mGroupsNaturalOrder.clear();
- qDeleteAll(mGroupsByName);
- mGroupsByName.clear();
-}
-
-void QGpgMECryptoConfigComponent::runGpgConf()
-{
- const QString gpgconf = QGpgMECryptoConfig::gpgConfPath();
- if (gpgconf.isEmpty()) {
- qCWarning(GPGPME_BACKEND_LOG) << "Can't get path to gpgconf executable...";
- return;
- }
-
- // Run gpgconf --list-options <component>, and create all groups and entries for that component
- KProcess proc;
- proc << gpgconf;
- proc << QStringLiteral("--list-options");
- proc << mName;
-
- //qCDebug(GPGPME_BACKEND_LOG) <<"Running gpgconf --list-options" << mName;
-
- connect(&proc, &KProcess::readyReadStandardOutput, this, &QGpgMECryptoConfigComponent::slotCollectStdOut);
- mCurrentGroup = 0;
-
- // run the process:
- int rc = 0;
- proc.setOutputChannelMode(KProcess::OnlyStdoutChannel);
- proc.start();
- if (!proc.waitForFinished()) {
- rc = -2;
- } else if (proc.exitStatus() == QProcess::NormalExit) {
- rc = proc.exitCode();
- } else {
- rc = -1;
- }
-
- if (rc != 0) { // can happen when using the wrong version of gpg...
- qCWarning(GPGPME_BACKEND_LOG) << "Running 'gpgconf --list-options" << mName << "' failed." << strerror(rc) << ", but try that command to see the real output";
- } else {
- if (mCurrentGroup && !mCurrentGroup->mEntriesNaturalOrder.empty()) { // only add non-empty groups
- mGroupsByName.insert(mCurrentGroupName, mCurrentGroup);
- mGroupsNaturalOrder.push_back(std::make_pair(mCurrentGroupName, mCurrentGroup));
- }
- }
-}
-
-void QGpgMECryptoConfigComponent::slotCollectStdOut()
-{
- assert(qobject_cast<KProcess *>(QObject::sender()));
- KProcess *const proc = static_cast<KProcess *>(QObject::sender());
- while (proc->canReadLine()) {
- QString line = QString::fromUtf8(proc->readLine());
- if (line.endsWith(QLatin1Char('\n'))) {
- line.chop(1);
- }
- if (line.endsWith(QLatin1Char('\r'))) {
- line.chop(1);
- }
- //qCDebug(GPGPME_BACKEND_LOG) <<"GOT LINE:" << line;
- // Format: NAME:FLAGS:LEVEL:DESCRIPTION:TYPE:ALT-TYPE:ARGNAME:DEFAULT:ARGDEF:VALUE
- const QStringList lst = line.split(QLatin1Char(':'));
- if (lst.count() >= 10) {
- const int flags = lst[1].toInt();
- const int level = lst[2].toInt();
- if (level > 2) { // invisible or internal -> skip it;
- continue;
- }
- if (flags & GPGCONF_FLAG_GROUP) {
- if (mCurrentGroup && !mCurrentGroup->mEntriesNaturalOrder.empty()) { // only add non-empty groups
- mGroupsByName.insert(mCurrentGroupName, mCurrentGroup);
- mGroupsNaturalOrder.push_back(std::make_pair(mCurrentGroupName, mCurrentGroup));
- }
- //else
- // qCDebug(GPGPME_BACKEND_LOG) <<"Discarding empty group" << mCurrentGroupName;
- mCurrentGroup = new QGpgMECryptoConfigGroup(this, lst[0], lst[3], level);
- mCurrentGroupName = lst[0];
- } else {
- // normal entry
- if (!mCurrentGroup) { // first toplevel entry -> create toplevel group
- mCurrentGroup = new QGpgMECryptoConfigGroup(this, QStringLiteral("<nogroup>"), QString(), 0);
- mCurrentGroupName = QStringLiteral("<nogroup>");
- }
- const QString &name = lst[0];
- QGpgMECryptoConfigEntry *value = new QGpgMECryptoConfigEntry(mCurrentGroup, lst);
- mCurrentGroup->mEntriesByName.insert(name, value);
- mCurrentGroup->mEntriesNaturalOrder.push_back(std::make_pair(name, value));
- }
- } else {
- // This happens on lines like
- // dirmngr[31465]: error opening `/home/dfaure/.gnupg/dirmngr_ldapservers.conf': No such file or directory
- // so let's not bother the user with it.
- //qCWarning(GPGPME_BACKEND_LOG) <<"Parse error on gpgconf --list-options output:" << line;
- }
- }
-}
-
-QStringList QGpgMECryptoConfigComponent::groupList() const
-{
- QStringList result;
- std::transform(mGroupsNaturalOrder.begin(), mGroupsNaturalOrder.end(),
- std::back_inserter(result), Select1St());
- return result;
-}
-
-QGpgME::CryptoConfigGroup *QGpgMECryptoConfigComponent::group(const QString &name) const
-{
- return mGroupsByName.value(name);
-}
-
-void QGpgMECryptoConfigComponent::sync(bool runtime)
-{
- QTemporaryFile tmpFile;
- tmpFile.open();
-
- QList<QGpgMECryptoConfigEntry *> dirtyEntries;
-
- // Collect all dirty entries
- const QList<QString> keylist = mGroupsByName.uniqueKeys();
- Q_FOREACH (const QString &key, keylist) {
- const QHash<QString, QGpgMECryptoConfigEntry *> entry = mGroupsByName[key]->mEntriesByName;
- const QList<QString> keylistentry = entry.uniqueKeys();
- Q_FOREACH (const QString &keyentry, keylistentry) {
- if (entry[keyentry]->isDirty()) {
- // OK, we can set it.currentKey() to it.current()->outputString()
- QString line = keyentry;
- if (entry[keyentry]->isSet()) { // set option
- line += QLatin1String(":0:");
- line += entry[keyentry]->outputString();
- } else { // unset option
- line += QLatin1String(":16:");
- }
-#ifdef Q_OS_WIN
- line += QLatin1Char('\r');
-#endif
- line += QLatin1Char('\n');
- const QByteArray line8bit = line.toUtf8(); // encode with utf8, and K3ProcIO uses utf8 when reading.
- tmpFile.write(line8bit);
- dirtyEntries.append(entry[keyentry]);
-
- }
- }
- }
-
- tmpFile.flush();
- if (dirtyEntries.isEmpty()) {
- return;
- }
-
- // Call gpgconf --change-options <component>
- const QString gpgconf = QGpgMECryptoConfig::gpgConfPath();
- QString commandLine = gpgconf.isEmpty()
- ? QStringLiteral("gpgconf")
- : KShell::quoteArg(gpgconf);
- if (runtime) {
- commandLine += QLatin1String(" --runtime");
- }
- commandLine += QLatin1String(" --change-options ");
- commandLine += KShell::quoteArg(mName);
- commandLine += QLatin1String(" < ");
- commandLine += KShell::quoteArg(tmpFile.fileName());
-
- //qCDebug(GPGPME_BACKEND_LOG) << commandLine;
- //system( QCString( "cat " ) + tmpFile.name().toLatin1() ); // DEBUG
-
- KProcess proc;
- proc.setShellCommand(commandLine);
-
- // run the process:
- int rc = proc.execute();
-
- if (rc == -2) {
- QString wmsg = i18n("Could not start gpgconf.\nCheck that gpgconf is in the PATH and that it can be started.");
- qCWarning(GPGPME_BACKEND_LOG) << wmsg;
- KMessageBox::error(0, wmsg);
- } else if (rc != 0) { // Happens due to bugs in gpgconf (e.g. issues 104/115)
- QString wmsg = i18n("Error from gpgconf while saving configuration: %1", QString::fromLocal8Bit(strerror(rc)));
- qCWarning(GPGPME_BACKEND_LOG) << ":" << strerror(rc);
- KMessageBox::error(0, wmsg);
- } else {
- QList<QGpgMECryptoConfigEntry *>::const_iterator it = dirtyEntries.constBegin();
- for (; it != dirtyEntries.constEnd(); ++it) {
- (*it)->setDirty(false);
- }
- }
-}
-
-////
-
-QGpgMECryptoConfigGroup::QGpgMECryptoConfigGroup(QGpgMECryptoConfigComponent *comp, const QString &name, const QString &description, int level)
- :
- mComponent(comp),
- mName(name),
- mDescription(description),
- mLevel(static_cast<QGpgME::CryptoConfigEntry::Level>(level))
-{
-}
-
-QGpgMECryptoConfigGroup::~QGpgMECryptoConfigGroup()
-{
- mEntriesNaturalOrder.clear();
- qDeleteAll(mEntriesByName);
- mEntriesByName.clear();
-}
-
-QStringList QGpgMECryptoConfigGroup::entryList() const
-{
- QStringList result;
- std::transform(mEntriesNaturalOrder.begin(), mEntriesNaturalOrder.end(),
- std::back_inserter(result), Select1St());
- return result;
-}
-
-QGpgME::CryptoConfigEntry *QGpgMECryptoConfigGroup::entry(const QString &name) const
-{
- return mEntriesByName.value(name);
-}
-
-////
-
-static QString gpgconf_unescape(const QString &str, bool handleComma = true)
-{
- /* See gpgconf_escape */
- QString dec(str);
- dec.replace(QStringLiteral("%25"), QStringLiteral("%"));
- dec.replace(QStringLiteral("%3a"), QStringLiteral(":"));
- if (handleComma) {
- dec.replace(QStringLiteral("%2c"), QStringLiteral(","));
- }
- return dec;
-}
-
-static QString gpgconf_escape(const QString &str, bool handleComma = true)
-{
- /* Gpgconf does not really percent encode. It just
- * encodes , % and : characters. It expects all other
- * chars to be UTF-8 encoded.
- * Except in the Base-DN part where a , may not be percent
- * escaped.
- */
- QString esc(str);
- esc.replace(QLatin1Char('%'), QStringLiteral("%25"));
- esc.replace(QLatin1Char(':'), QStringLiteral("%3a"));
- if (handleComma) {
- esc.replace(QLatin1Char(','), QStringLiteral("%2c"));
- }
- return esc;
-}
-
-static QString urlpart_escape(const QString &str)
-{
- /* We need to double escape here, as a username or password
- * or an LDAP Base-DN may contain : or , and in that
- * case we would break gpgconf's format if we only escaped
- * the : once. As an escaped : is used internaly to split
- * the parts of an url. */
-
- return gpgconf_escape(gpgconf_escape(str, false), false);
-}
-
-static QString urlpart_unescape(const QString &str)
-{
- /* See urlpart_escape */
- return gpgconf_unescape(gpgconf_unescape(str, false), false);
-}
-
-// gpgconf arg type number -> CryptoConfigEntry arg type enum mapping
-static QGpgME::CryptoConfigEntry::ArgType knownArgType(int argType, bool &ok)
-{
- ok = true;
- switch (argType) {
- case 0: // none
- return QGpgME::CryptoConfigEntry::ArgType_None;
- case 1: // string
- return QGpgME::CryptoConfigEntry::ArgType_String;
- case 2: // int32
- return QGpgME::CryptoConfigEntry::ArgType_Int;
- case 3: // uint32
- return QGpgME::CryptoConfigEntry::ArgType_UInt;
- case 32: // pathname
- return QGpgME::CryptoConfigEntry::ArgType_Path;
- case 33: // ldap server
- return QGpgME::CryptoConfigEntry::ArgType_LDAPURL;
- default:
- ok = false;
- return QGpgME::CryptoConfigEntry::ArgType_None;
- }
-}
-
-QGpgMECryptoConfigEntry::QGpgMECryptoConfigEntry(QGpgMECryptoConfigGroup *group, const QStringList &parsedLine)
- : mGroup(group)
-{
- // Format: NAME:FLAGS:LEVEL:DESCRIPTION:TYPE:ALT-TYPE:ARGNAME:DEFAULT:ARGDEF:VALUE
- assert(parsedLine.count() >= 10); // called checked for it already
- QStringList::const_iterator it = parsedLine.constBegin();
- mName = *it++;
- mFlags = (*it++).toInt();
- mLevel = (*it++).toInt();
- mDescription = *it++;
- bool ok;
- // we keep the real (int) arg type, since it influences the parsing (e.g. for ldap urls)
- mRealArgType = (*it++).toInt();
- mArgType = knownArgType(mRealArgType, ok);
- if (!ok && !(*it).isEmpty()) {
- // use ALT-TYPE
- mRealArgType = (*it).toInt();
- mArgType = knownArgType(mRealArgType, ok);
- }
- if (!ok) {
- qCWarning(GPGPME_BACKEND_LOG) << "Unsupported datatype:" << parsedLine[4] << " :" << *it << " for" << parsedLine[0];
- }
- ++it; // done with alt-type
- ++it; // skip argname (not useful in GUIs)
-
- mSet = false;
- QString value;
- if (mFlags & GPGCONF_FLAG_DEFAULT) {
- value = *it; // get default value
- mDefaultValue = stringToValue(value, true);
- }
- ++it; // done with DEFAULT
- ++it; // ### skip ARGDEF for now. It's only for options with an "optional arg"
- //qCDebug(GPGPME_BACKEND_LOG) <<"Entry" << parsedLine[0] <<" val=" << *it;
-
- if (!(*it).isEmpty()) { // a real value was set
- mSet = true;
- value = *it;
- mValue = stringToValue(value, true);
- } else {
- mValue = mDefaultValue;
- }
-
- mDirty = false;
-}
-
-QVariant QGpgMECryptoConfigEntry::stringToValue(const QString &str, bool unescape) const
-{
- const bool isString = isStringType();
-
- if (isList()) {
- if (argType() == ArgType_None) {
- bool ok = true;
- const QVariant v = str.isEmpty() ? 0U : str.toUInt(&ok);
- if (!ok) {
- qCWarning(GPGPME_BACKEND_LOG) << "list-of-none should have an unsigned int as value:" << str;
- }
- return v;
- }
- QList<QVariant> lst;
- QStringList items = str.split(QLatin1Char(','), QString::SkipEmptyParts);
- for (QStringList::const_iterator valit = items.constBegin(); valit != items.constEnd(); ++valit) {
- QString val = *valit;
- if (isString) {
- if (val.isEmpty()) {
- lst << QVariant(QString());
- continue;
- } else if (unescape) {
- if (val[0] != QLatin1Char('"')) { // see README.gpgconf
- qCWarning(GPGPME_BACKEND_LOG) << "String value should start with '\"' :" << val;
- }
- val = val.mid(1);
- }
- }
- lst << QVariant(unescape ? gpgconf_unescape(val) : val);
- }
- return lst;
- } else { // not a list
- QString val(str);
- if (isString) {
- if (val.isEmpty()) {
- return QVariant(QString()); // not set [ok with lists too?]
- } else if (unescape) {
- if (val[0] != QLatin1Char('"')) { // see README.gpgconf
- qCWarning(GPGPME_BACKEND_LOG) << "String value should start with '\"' :" << val;
- }
- val = val.mid(1);
- }
- }
- return QVariant(unescape ? gpgconf_unescape(val) : val);
- }
-}
-
-QGpgMECryptoConfigEntry::~QGpgMECryptoConfigEntry()
-{
-#ifndef NDEBUG
- if (!s_duringClear && mDirty)
- qCWarning(GPGPME_BACKEND_LOG) << "Deleting a QGpgMECryptoConfigEntry that was modified (" << mDescription << ")"
- << "You forgot to call sync() (to commit) or clear() (to discard)";
-#endif
-}
-
-bool QGpgMECryptoConfigEntry::isOptional() const
-{
- return mFlags & GPGCONF_FLAG_OPTIONAL;
-}
-
-bool QGpgMECryptoConfigEntry::isReadOnly() const
-{
- return mFlags & GPGCONF_FLAG_NO_CHANGE;
-}
-
-bool QGpgMECryptoConfigEntry::isList() const
-{
- return mFlags & GPGCONF_FLAG_LIST;
-}
-
-bool QGpgMECryptoConfigEntry::isRuntime() const
-{
- return mFlags & GPGCONF_FLAG_RUNTIME;
-}
-
-bool QGpgMECryptoConfigEntry::isSet() const
-{
- return mSet;
-}
-
-bool QGpgMECryptoConfigEntry::boolValue() const
-{
- Q_ASSERT(mArgType == ArgType_None);
- Q_ASSERT(!isList());
- return mValue.toBool();
-}
-
-QString QGpgMECryptoConfigEntry::stringValue() const
-{
- return toString(false);
-}
-
-int QGpgMECryptoConfigEntry::intValue() const
-{
- Q_ASSERT(mArgType == ArgType_Int);
- Q_ASSERT(!isList());
- return mValue.toInt();
-}
-
-unsigned int QGpgMECryptoConfigEntry::uintValue() const
-{
- Q_ASSERT(mArgType == ArgType_UInt);
- Q_ASSERT(!isList());
- return mValue.toUInt();
-}
-
-static QUrl parseURL(int mRealArgType, const QString &str)
-{
- if (mRealArgType == 33) { // LDAP server
- // The format is HOSTNAME:PORT:USERNAME:PASSWORD:BASE_DN
- QStringList items = str.split(QLatin1Char(':'));
- if (items.count() == 5) {
- QStringList::const_iterator it = items.constBegin();
- QUrl url;
- url.setScheme(QStringLiteral("ldap"));
- url.setHost(gpgconf_unescape(*it++));
-
- bool ok;
- const int port = (*it++).toInt(&ok);
- if (ok) {
- url.setPort(port);
- } else if (!it->isEmpty()) {
- qCWarning(GPGPME_BACKEND_LOG) << "parseURL: malformed LDAP server port, ignoring: \"" << *it << "\"";
- }
-
- const QString userName = urlpart_unescape(*it++);
- if (!userName.isEmpty()) {
- url.setUserName(userName);
- }
- const QString passWord = urlpart_unescape(*it++);
- if (!passWord.isEmpty()) {
- url.setPassword(passWord);
- }
- url.setQuery(urlpart_unescape(*it));
- return url;
- } else {
- qCWarning(GPGPME_BACKEND_LOG) << "parseURL: malformed LDAP server:" << str;
- }
- }
- // other URLs : assume wellformed URL syntax.
- return QUrl(str);
-}
-
-// The opposite of parseURL
-static QString splitURL(int mRealArgType, const QUrl &url)
-{
- if (mRealArgType == 33) { // LDAP server
- // The format is HOSTNAME:PORT:USERNAME:PASSWORD:BASE_DN
- Q_ASSERT(url.scheme() == QLatin1String("ldap"));
- return gpgconf_escape(url.host()) + QLatin1Char(':') +
- (url.port() != -1 ? QString::number(url.port()) : QString()) + QLatin1Char(':') + // -1 is used for default ports, omit
- urlpart_escape(url.userName()) + QLatin1Char(':') +
- urlpart_escape(url.password()) + QLatin1Char(':') +
- urlpart_escape(url.query());
- }
- return url.path();
-}
-
-QUrl QGpgMECryptoConfigEntry::urlValue() const
-{
- Q_ASSERT(mArgType == ArgType_Path || mArgType == ArgType_LDAPURL);
- Q_ASSERT(!isList());
- QString str = mValue.toString();
- if (mArgType == ArgType_Path) {
- QUrl url = QUrl::fromUserInput(str, QString(), QUrl::AssumeLocalFile);
- return url;
- }
- return parseURL(mRealArgType, str);
-}
-
-unsigned int QGpgMECryptoConfigEntry::numberOfTimesSet() const
-{
- Q_ASSERT(mArgType == ArgType_None);
- Q_ASSERT(isList());
- return mValue.toUInt();
-}
-
-std::vector<int> QGpgMECryptoConfigEntry::intValueList() const
-{
- Q_ASSERT(mArgType == ArgType_Int);
- Q_ASSERT(isList());
- std::vector<int> ret;
- QList<QVariant> lst = mValue.toList();
- ret.reserve(lst.size());
- for (QList<QVariant>::const_iterator it = lst.constBegin(); it != lst.constEnd(); ++it) {
- ret.push_back((*it).toInt());
- }
- return ret;
-}
-
-std::vector<unsigned int> QGpgMECryptoConfigEntry::uintValueList() const
-{
- Q_ASSERT(mArgType == ArgType_UInt);
- Q_ASSERT(isList());
- std::vector<unsigned int> ret;
- QList<QVariant> lst = mValue.toList();
- ret.reserve(lst.size());
- for (QList<QVariant>::const_iterator it = lst.constBegin(); it != lst.constEnd(); ++it) {
- ret.push_back((*it).toUInt());
- }
- return ret;
-}
-
-QList<QUrl> QGpgMECryptoConfigEntry::urlValueList() const
-{
- Q_ASSERT(mArgType == ArgType_Path || mArgType == ArgType_LDAPURL);
- Q_ASSERT(isList());
- QStringList lst = mValue.toStringList();
-
- QList<QUrl> ret;
- for (QStringList::const_iterator it = lst.constBegin(); it != lst.constEnd(); ++it) {
- if (mArgType == ArgType_Path) {
- QUrl url = QUrl::fromUserInput(*it, QString(), QUrl::AssumeLocalFile);
- } else {
- ret << parseURL(mRealArgType, *it);
- }
- }
- return ret;
-}
-
-void QGpgMECryptoConfigEntry::resetToDefault()
-{
- mSet = false;
- mDirty = true;
- if (mFlags & GPGCONF_FLAG_DEFAULT) {
- mValue = mDefaultValue;
- } else if (mArgType == ArgType_None) {
- if (isList()) {
- mValue = 0U;
- } else {
- mValue = false;
- }
- }
-}
-
-void QGpgMECryptoConfigEntry::setBoolValue(bool b)
-{
- Q_ASSERT(mArgType == ArgType_None);
- Q_ASSERT(!isList());
- // A "no arg" option is either set or not set.
- // Being set means mSet==true + mValue==true, being unset means resetToDefault(), i.e. both false
- mValue = b;
- mSet = b;
- mDirty = true;
-}
-
-void QGpgMECryptoConfigEntry::setStringValue(const QString &str)
-{
- mValue = stringToValue(str, false);
- // When setting a string to empty (and there's no default), we need to act like resetToDefault
- // Otherwise we try e.g. "ocsp-responder:0:" and gpgconf answers:
- // "gpgconf: argument required for option ocsp-responder"
- if (str.isEmpty() && !isOptional()) {
- mSet = false;
- } else {
- mSet = true;
- }
- mDirty = true;
-}
-
-void QGpgMECryptoConfigEntry::setIntValue(int i)
-{
- Q_ASSERT(mArgType == ArgType_Int);
- Q_ASSERT(!isList());
- mValue = i;
- mSet = true;
- mDirty = true;
-}
-
-void QGpgMECryptoConfigEntry::setUIntValue(unsigned int i)
-{
- mValue = i;
- mSet = true;
- mDirty = true;
-}
-
-void QGpgMECryptoConfigEntry::setURLValue(const QUrl &url)
-{
- QString str = splitURL(mRealArgType, url);
- if (str.isEmpty() && !isOptional()) {
- mSet = false;
- } else {
- mSet = true;
- }
- mValue = str;
- mDirty = true;
-}
-
-void QGpgMECryptoConfigEntry::setNumberOfTimesSet(unsigned int i)
-{
- Q_ASSERT(mArgType == ArgType_None);
- Q_ASSERT(isList());
- mValue = i;
- mSet = i > 0;
- mDirty = true;
-}
-
-void QGpgMECryptoConfigEntry::setIntValueList(const std::vector<int> &lst)
-{
- QList<QVariant> ret;
- for (std::vector<int>::const_iterator it = lst.begin(); it != lst.end(); ++it) {
- ret << QVariant(*it);
- }
- mValue = ret;
- if (ret.isEmpty() && !isOptional()) {
- mSet = false;
- } else {
- mSet = true;
- }
- mDirty = true;
-}
-
-void QGpgMECryptoConfigEntry::setUIntValueList(const std::vector<unsigned int> &lst)
-{
- QList<QVariant> ret;
- for (std::vector<unsigned int>::const_iterator it = lst.begin(); it != lst.end(); ++it) {
- ret << QVariant(*it);
- }
- if (ret.isEmpty() && !isOptional()) {
- mSet = false;
- } else {
- mSet = true;
- }
- mValue = ret;
- mDirty = true;
-}
-
-void QGpgMECryptoConfigEntry::setURLValueList(const QList<QUrl> &urls)
-{
- QStringList lst;
- for (QList<QUrl>::const_iterator it = urls.constBegin(); it != urls.constEnd(); ++it) {
- lst << splitURL(mRealArgType, *it);
- }
- mValue = lst;
- if (lst.isEmpty() && !isOptional()) {
- mSet = false;
- } else {
- mSet = true;
- }
- mDirty = true;
-}
-
-QString QGpgMECryptoConfigEntry::toString(bool escape) const
-{
- // Basically the opposite of stringToValue
- if (isStringType()) {
- if (mValue.isNull()) {
- return QString();
- } else if (isList()) { // string list
- QStringList lst = mValue.toStringList();
- if (escape) {
- for (QStringList::iterator it = lst.begin(); it != lst.end(); ++it) {
- if (!(*it).isNull()) {
- *it = gpgconf_escape(*it).prepend(QLatin1String("\""));
- }
- }
- }
- const QString res = lst.join(QStringLiteral(","));
- //qCDebug(GPGPME_BACKEND_LOG) <<"toString:" << res;
- return res;
- } else { // normal string
- QString res = mValue.toString();
- if (escape) {
- res = gpgconf_escape(res).prepend(QLatin1String("\""));
- }
- return res;
- }
- }
- if (!isList()) { // non-list non-string
- if (mArgType == ArgType_None) {
- return mValue.toBool() ? QStringLiteral("1") : QString();
- } else { // some int
- Q_ASSERT(mArgType == ArgType_Int || mArgType == ArgType_UInt);
- return mValue.toString(); // int to string conversion
- }
- }
-
- // Lists (of other types than strings)
- if (mArgType == ArgType_None) {
- return QString::number(numberOfTimesSet());
- }
-
- QStringList ret;
- QList<QVariant> lst = mValue.toList();
- for (QList<QVariant>::const_iterator it = lst.constBegin(); it != lst.constEnd(); ++it) {
- ret << (*it).toString(); // QVariant does the conversion
- }
- return ret.join(QStringLiteral(","));
-}
-
-QString QGpgMECryptoConfigEntry::outputString() const
-{
- Q_ASSERT(mSet);
- return toString(true);
-}
-
-bool QGpgMECryptoConfigEntry::isStringType() const
-{
- return (mArgType == QGpgME::CryptoConfigEntry::ArgType_String
- || mArgType == QGpgME::CryptoConfigEntry::ArgType_Path
- || mArgType == QGpgME::CryptoConfigEntry::ArgType_LDAPURL);
-}
-
-void QGpgMECryptoConfigEntry::setDirty(bool b)
-{
- mDirty = b;
-}
diff --git a/lang/qt/src/qgpgmecryptoconfig.h b/lang/qt/src/qgpgmecryptoconfig.h
deleted file mode 100644
index b4af1e6..0000000
--- a/lang/qt/src/qgpgmecryptoconfig.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- qgpgmecryptoconfig.h
-
- This file is part of qgpgme, the Qt API binding for gpgme
- Copyright (c) 2004 Klarälvdalens Datakonsult AB
- Copyright (c) 2016 Intevation GmbH
-
- Libkleopatra 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.
-
- Libkleopatra 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_QGPGMECRYPTOCONFIG_H
-#define QGPGME_QGPGMECRYPTOCONFIG_H
-
-#include "qgpgme_export.h"
-#include "cryptoconfig.h"
-
-#include <QHash>
-#include <QStringList>
-#include <QObject>
-#include <QVariant>
-#include <QPointer>
-
-#include <vector>
-#include <utility>
-
-class QGpgMECryptoConfigComponent;
-class QGpgMECryptoConfigEntry;
-/**
- * CryptoConfig implementation around the gpgconf command-line tool
- * For method docu, see kleo/cryptoconfig.h
- */
-class QGPGME_EXPORT QGpgMECryptoConfig : public QObject, public QGpgME::CryptoConfig
-{
-
- Q_OBJECT
-public:
-
- static QString gpgConfPath();
- /**
- * Constructor
- */
- QGpgMECryptoConfig();
- virtual ~QGpgMECryptoConfig();
-
- QStringList componentList() const Q_DECL_OVERRIDE;
-
- QGpgME::CryptoConfigComponent *component(const QString &name) const Q_DECL_OVERRIDE;
-
- void clear() Q_DECL_OVERRIDE;
- void sync(bool runtime) Q_DECL_OVERRIDE;
-
-private Q_SLOTS:
- void slotCollectStdOut();
-private:
- /// @param showErrors if true, a messagebox will be shown if e.g. gpgconf wasn't found
- void runGpgConf(bool showErrors);
-
-private:
- std::vector<std::pair<QString, QGpgMECryptoConfigComponent *> > mComponentsNaturalOrder;
- QHash<QString, QGpgMECryptoConfigComponent *> mComponentsByName;
- bool mParsed;
-};
-
-class QGpgMECryptoConfigGroup;
-
-/// For docu, see kleo/cryptoconfig.h
-class QGpgMECryptoConfigComponent : public QObject, public QGpgME::CryptoConfigComponent
-{
-
- Q_OBJECT
-public:
- QGpgMECryptoConfigComponent(QGpgMECryptoConfig *, const QString &name, const QString &description);
- ~QGpgMECryptoConfigComponent();
-
- QString name() const Q_DECL_OVERRIDE
- {
- return mName;
- }
- QString iconName() const Q_DECL_OVERRIDE
- {
- return mName;
- }
- QString description() const Q_DECL_OVERRIDE
- {
- return mDescription;
- }
- QStringList groupList() const Q_DECL_OVERRIDE;
- QGpgME::CryptoConfigGroup *group(const QString &name) const Q_DECL_OVERRIDE;
-
- void sync(bool runtime);
-
-private Q_SLOTS:
- void slotCollectStdOut();
-private:
- void runGpgConf();
-
-private:
- std::vector< std::pair<QString, QGpgMECryptoConfigGroup *> > mGroupsNaturalOrder;
- QHash<QString, QGpgMECryptoConfigGroup *> mGroupsByName;
- QString mName;
- QString mDescription;
- QGpgMECryptoConfigGroup *mCurrentGroup; // during parsing
- QString mCurrentGroupName; // during parsing
-};
-
-class QGpgMECryptoConfigGroup : public QGpgME::CryptoConfigGroup
-{
-
-public:
- QGpgMECryptoConfigGroup(QGpgMECryptoConfigComponent *comp, const QString &name, const QString &description, int level);
- ~QGpgMECryptoConfigGroup();
-
- QString name() const Q_DECL_OVERRIDE
- {
- return mName;
- }
- QString iconName() const Q_DECL_OVERRIDE
- {
- return QString();
- }
- QString description() const Q_DECL_OVERRIDE
- {
- return mDescription;
- }
- QString path() const Q_DECL_OVERRIDE
- {
- return mComponent->name() + QLatin1Char('/') + mName;
- }
- QGpgME::CryptoConfigEntry::Level level() const Q_DECL_OVERRIDE
- {
- return mLevel;
- }
- QStringList entryList() const Q_DECL_OVERRIDE;
- QGpgME::CryptoConfigEntry *entry(const QString &name) const Q_DECL_OVERRIDE;
-
-private:
- friend class QGpgMECryptoConfigComponent; // it adds the entries
- QPointer<QGpgMECryptoConfigComponent> mComponent;
- std::vector< std::pair<QString, QGpgMECryptoConfigEntry *> > mEntriesNaturalOrder;
- QHash<QString, QGpgMECryptoConfigEntry *> mEntriesByName;
- QString mName;
- QString mDescription;
- QGpgME::CryptoConfigEntry::Level mLevel;
-};
-
-class QGpgMECryptoConfigEntry : public QGpgME::CryptoConfigEntry
-{
-public:
- QGpgMECryptoConfigEntry(QGpgMECryptoConfigGroup *group, const QStringList &parsedLine);
- ~QGpgMECryptoConfigEntry();
-
- QString name() const Q_DECL_OVERRIDE
- {
- return mName;
- }
- QString description() const Q_DECL_OVERRIDE
- {
- return mDescription;
- }
- QString path() const Q_DECL_OVERRIDE
- {
- return mGroup->path() + QLatin1Char('/') + mName;
- }
- bool isOptional() const Q_DECL_OVERRIDE;
- bool isReadOnly() const Q_DECL_OVERRIDE;
- bool isList() const Q_DECL_OVERRIDE;
- bool isRuntime() const Q_DECL_OVERRIDE;
- Level level() const Q_DECL_OVERRIDE
- {
- return static_cast<Level>(mLevel);
- }
- ArgType argType() const Q_DECL_OVERRIDE
- {
- return static_cast<ArgType>(mArgType);
- }
- bool isSet() const Q_DECL_OVERRIDE;
- bool boolValue() const Q_DECL_OVERRIDE;
- QString stringValue() const Q_DECL_OVERRIDE;
- int intValue() const Q_DECL_OVERRIDE;
- unsigned int uintValue() const Q_DECL_OVERRIDE;
- QUrl urlValue() const Q_DECL_OVERRIDE;
- unsigned int numberOfTimesSet() const Q_DECL_OVERRIDE;
- std::vector<int> intValueList() const Q_DECL_OVERRIDE;
- std::vector<unsigned int> uintValueList() const Q_DECL_OVERRIDE;
- QList<QUrl> urlValueList() const Q_DECL_OVERRIDE;
- void resetToDefault() Q_DECL_OVERRIDE;
- void setBoolValue(bool) Q_DECL_OVERRIDE;
- void setStringValue(const QString &) Q_DECL_OVERRIDE;
- void setIntValue(int) Q_DECL_OVERRIDE;
- void setUIntValue(unsigned int) Q_DECL_OVERRIDE;
- void setURLValue(const QUrl &) Q_DECL_OVERRIDE;
- void setNumberOfTimesSet(unsigned int) Q_DECL_OVERRIDE;
- void setIntValueList(const std::vector<int> &) Q_DECL_OVERRIDE;
- void setUIntValueList(const std::vector<unsigned int> &) Q_DECL_OVERRIDE;
- void setURLValueList(const QList<QUrl> &) Q_DECL_OVERRIDE;
- bool isDirty() const Q_DECL_OVERRIDE
- {
- return mDirty;
- }
-
- void setDirty(bool b);
- QString outputString() const;
-
-protected:
- bool isStringType() const;
- QVariant stringToValue(const QString &value, bool unescape) const;
- QString toString(bool escape) const;
-private:
- QGpgMECryptoConfigGroup *mGroup;
- QString mName;
- QString mDescription;
- QVariant mDefaultValue;
- QVariant mValue;
- uint mFlags : 8; // bitfield with 8 bits
- uint mLevel : 3; // max is 4 (2, in fact) -> 3 bits
- uint mRealArgType : 6; // max is 33 -> 6 bits
- uint mArgType : 3; // max is 6 (ArgType enum) -> 3 bits;
- uint mDirty : 1;
- uint mSet : 1;
-};
-
-#endif /* QGPGME_QGPGMECRYPTOCONFIG_H */
commit 63c115b067400e1b02c7d849c99f54dc9f394d68
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sat Apr 2 09:14:10 2016 -0800
Add additional include path in config files
* lang/cpp/src/GpgmeppConfig.cmake.in.in
lang/qt/src/QGpgmeConfig.cmake.in.in: Include directory above headers.
--
This ensures that code using #inlcude <gpgme++/header.h> still works.
diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
index 51218c6..a61ba32 100644
--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
@@ -68,7 +68,7 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
add_library(Gpgmepp SHARED IMPORTED)
set_target_properties(Gpgmepp PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/gpgme++"
+ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include/gpgme++"
INTERFACE_LINK_LIBRARIES "@resolved_libdir@/libgpgme at libsuffix@;@LIBASSUAN_LIBS@;@GPG_ERROR_LIBS@"
IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp at libsuffix@"
)
diff --git a/lang/qt/src/QGpgmeConfig.cmake.in.in b/lang/qt/src/QGpgmeConfig.cmake.in.in
index 36ee920..3d19696 100644
--- a/lang/qt/src/QGpgmeConfig.cmake.in.in
+++ b/lang/qt/src/QGpgmeConfig.cmake.in.in
@@ -68,7 +68,7 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
add_library(QGpgme SHARED IMPORTED)
set_target_properties(QGpgme PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/qgpgme"
+ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include/qgpgme"
INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core"
IMPORTED_LOCATION "@resolved_libdir@/libqgpgme at libsuffix@"
)
commit 576be46f34b42e896a5e3be65560a4b518a758be
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Sat Apr 2 09:12:23 2016 -0800
Qt: Fix library name in nodist variable
* lang/qt/Makefile.am (nodist_qgpgme_SOURCES): Change to real name.
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index a3f99a0..6435983 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -185,7 +185,7 @@ BUILT_SOURCES = $(qgpgme_moc_sources)
CLEANFILES = $(qgpgme_moc_sources)
-nodist_qgpgme_SOURCES = $(qgpgme_moc_sources)
+nodist_libqgpgme_la_SOURCES = $(qgpgme_moc_sources)
.h.moc:
$(MOC) `test -f '$<' || echo '$(srcdir)/'`$< -o $@
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 1 +
lang/cpp/src/GpgmeppConfig.cmake.in.in | 2 +-
lang/qt/Makefile.am | 2 +-
lang/qt/src/Makefile.am | 2 +-
lang/qt/src/QGpgmeConfig.cmake.in.in | 2 +-
lang/qt/src/job.h | 2 -
lang/qt/src/qgpgmeadduseridjob.cpp | 1 +
lang/qt/src/qgpgmebackend.cpp | 8 +-
lang/qt/src/qgpgmebackend.h | 10 +-
lang/qt/src/qgpgmechangeexpiryjob.cpp | 1 +
lang/qt/src/qgpgmechangeownertrustjob.cpp | 1 +
lang/qt/src/qgpgmechangepasswdjob.cpp | 2 +
lang/qt/src/qgpgmecryptoconfig.cpp | 948 ---------------------------
lang/qt/src/qgpgmecryptoconfig.h | 245 -------
lang/qt/src/qgpgmedecryptjob.cpp | 2 +
lang/qt/src/qgpgmedecryptverifyjob.cpp | 1 +
lang/qt/src/qgpgmedeletejob.cpp | 1 +
lang/qt/src/qgpgmedownloadjob.cpp | 1 +
lang/qt/src/qgpgmeencryptjob.cpp | 1 +
lang/qt/src/qgpgmeexportjob.cpp | 1 +
lang/qt/src/qgpgmeimportfromkeyserverjob.cpp | 1 +
lang/qt/src/qgpgmeimportjob.cpp | 1 +
lang/qt/src/qgpgmekeygenerationjob.cpp | 1 +
lang/qt/src/qgpgmekeylistjob.cpp | 1 +
lang/qt/src/qgpgmelistallkeysjob.cpp | 1 +
lang/qt/src/qgpgmerefreshkeysjob.cpp | 1 +
lang/qt/src/qgpgmesecretkeyexportjob.cpp | 1 +
lang/qt/src/qgpgmesignencryptjob.cpp | 1 +
lang/qt/src/qgpgmesignjob.cpp | 1 +
lang/qt/src/qgpgmesignkeyjob.cpp | 1 +
lang/qt/src/qgpgmeverifydetachedjob.cpp | 1 +
lang/qt/src/qgpgmeverifyopaquejob.cpp | 1 +
lang/qt/tests/Makefile.am | 66 ++
lang/qt/tests/t-keylist.cpp | 31 +
m4/qt.m4 | 5 +
35 files changed, 137 insertions(+), 1211 deletions(-)
delete mode 100644 lang/qt/src/qgpgmecryptoconfig.cpp
delete mode 100644 lang/qt/src/qgpgmecryptoconfig.h
create mode 100644 lang/qt/tests/Makefile.am
create mode 100644 lang/qt/tests/t-keylist.cpp
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list