[Pkg-gnupg-commit] [gpgme] 82/412: Merge branch 'gpgmepp'
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Thu Sep 22 21:26:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gpgme.
commit 34e5c5b33de3608bedc2826be27a06e6eec0ea44
Merge: fc38c15 c303292
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue May 10 16:43:36 2016 +0200
Merge branch 'gpgmepp'
acinclude.m4 | 16 +
configure.ac | 144 +-
lang/Makefile.am | 2 +-
lang/README | 2 +
lang/cpp/Makefile.am | 23 +
lang/cpp/README | 60 +
lang/cpp/src/GpgmeppConfig.cmake.in.in | 108 +
lang/cpp/src/GpgmeppConfigVersion.cmake.in | 31 +
lang/cpp/src/Makefile.am | 93 +
lang/cpp/src/assuanresult.cpp | 90 +
lang/cpp/src/assuanresult.h | 79 +
lang/cpp/src/callbacks.cpp | 149 ++
lang/cpp/src/callbacks.h | 45 +
lang/cpp/src/configuration.cpp | 934 ++++++++
lang/cpp/src/configuration.h | 290 +++
lang/cpp/src/context.cpp | 1494 +++++++++++++
lang/cpp/src/context.h | 353 ++++
lang/cpp/src/context_glib.cpp | 35 +
lang/cpp/src/context_p.h | 84 +
lang/cpp/src/context_qt.cpp | 35 +
lang/cpp/src/context_vanilla.cpp | 33 +
lang/cpp/src/data.cpp | 208 ++
lang/cpp/src/data.h | 123 ++
lang/cpp/src/data_p.h | 40 +
lang/cpp/src/decryptionresult.cpp | 240 +++
lang/cpp/src/decryptionresult.h | 130 ++
lang/cpp/src/defaultassuantransaction.cpp | 78 +
lang/cpp/src/defaultassuantransaction.h | 65 +
lang/cpp/src/editinteractor.cpp | 344 +++
lang/cpp/src/editinteractor.h | 68 +
lang/cpp/src/encryptionresult.cpp | 159 ++
lang/cpp/src/encryptionresult.h | 113 +
lang/cpp/src/engineinfo.cpp | 83 +
lang/cpp/src/engineinfo.h | 70 +
lang/cpp/src/error.h | 78 +
lang/cpp/src/eventloopinteractor.cpp | 199 ++
lang/cpp/src/eventloopinteractor.h | 156 ++
lang/cpp/src/exception.cpp | 58 +
lang/cpp/src/exception.h | 68 +
lang/cpp/src/global.h | 206 ++
lang/cpp/src/gpgadduserideditinteractor.cpp | 189 ++
lang/cpp/src/gpgadduserideditinteractor.h | 67 +
lang/cpp/src/gpgagentgetinfoassuantransaction.cpp | 119 ++
lang/cpp/src/gpgagentgetinfoassuantransaction.h | 73 +
lang/cpp/src/gpgmefw.h | 70 +
lang/cpp/src/gpgmepp_export.h | 53 +
lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp | 141 ++
lang/cpp/src/gpgsetexpirytimeeditinteractor.h | 49 +
lang/cpp/src/gpgsetownertrusteditinteractor.cpp | 151 ++
lang/cpp/src/gpgsetownertrusteditinteractor.h | 50 +
lang/cpp/src/gpgsignkeyeditinteractor.cpp | 318 +++
lang/cpp/src/gpgsignkeyeditinteractor.h | 64 +
lang/cpp/src/importresult.cpp | 215 ++
lang/cpp/src/importresult.h | 134 ++
lang/cpp/src/interfaces/assuantransaction.h | 49 +
lang/cpp/src/interfaces/dataprovider.h | 53 +
lang/cpp/src/interfaces/passphraseprovider.h | 40 +
lang/cpp/src/interfaces/progressprovider.h | 40 +
lang/cpp/src/key.cpp | 828 ++++++++
lang/cpp/src/key.h | 380 ++++
lang/cpp/src/keygenerationresult.cpp | 92 +
lang/cpp/src/keygenerationresult.h | 82 +
lang/cpp/src/keylistresult.cpp | 107 +
lang/cpp/src/keylistresult.h | 81 +
lang/cpp/src/notation.h | 84 +
lang/cpp/src/result.h | 58 +
lang/cpp/src/result_p.h | 43 +
lang/cpp/src/scdgetinfoassuantransaction.cpp | 156 ++
lang/cpp/src/scdgetinfoassuantransaction.h | 76 +
lang/cpp/src/signingresult.cpp | 265 +++
lang/cpp/src/signingresult.h | 162 ++
lang/cpp/src/trustitem.cpp | 114 +
lang/cpp/src/trustitem.h | 81 +
lang/cpp/src/util.h | 146 ++
lang/cpp/src/verificationresult.cpp | 557 +++++
lang/cpp/src/verificationresult.h | 173 ++
lang/cpp/src/vfsmountresult.cpp | 90 +
lang/cpp/src/vfsmountresult.h | 76 +
lang/qt/Makefile.am | 23 +
lang/qt/README | 40 +
lang/qt/doc/Doxyfile.in | 2352 +++++++++++++++++++++
lang/{ => qt/doc}/Makefile.am | 21 +-
lang/qt/src/Makefile.am | 195 ++
lang/qt/src/QGpgmeConfig.cmake.in.in | 107 +
lang/qt/src/QGpgmeConfigVersion.cmake.in | 31 +
lang/qt/src/abstractimportjob.h | 62 +
lang/qt/src/adduseridjob.h | 84 +
lang/qt/src/changeexpiryjob.h | 84 +
lang/qt/src/changeownertrustjob.h | 81 +
lang/qt/src/changepasswdjob.h | 82 +
lang/qt/src/cryptoconfig.h | 399 ++++
lang/qt/src/dataprovider.cpp | 282 +++
lang/qt/src/dataprovider.h | 95 +
lang/qt/src/decryptjob.h | 100 +
lang/qt/src/decryptverifyjob.h | 105 +
lang/qt/src/deletejob.h | 82 +
lang/qt/src/downloadjob.h | 103 +
lang/qt/src/encryptjob.h | 119 ++
lang/qt/src/exportjob.h | 86 +
lang/qt/src/gpgme_backend_debug.cpp | 10 +
lang/qt/src/gpgme_backend_debug.h | 11 +
lang/qt/src/hierarchicalkeylistjob.h | 125 ++
lang/qt/src/importfromkeyserverjob.h | 83 +
lang/qt/src/importjob.h | 82 +
lang/qt/src/job.cpp | 150 ++
lang/qt/src/job.h | 92 +
lang/qt/src/keygenerationjob.h | 84 +
lang/qt/src/keylistjob.h | 105 +
lang/qt/src/listallkeysjob.h | 103 +
lang/qt/src/multideletejob.h | 107 +
lang/qt/src/protocol.h | 123 ++
lang/qt/src/protocol_p.h | 371 ++++
lang/qt/src/qgpgme_export.h | 53 +
lang/qt/src/qgpgmeadduseridjob.cpp | 82 +
lang/qt/src/qgpgmeadduseridjob.h | 65 +
lang/qt/src/qgpgmebackend.cpp | 203 ++
lang/qt/src/qgpgmebackend.h | 92 +
lang/qt/src/qgpgmechangeexpiryjob.cpp | 81 +
lang/qt/src/qgpgmechangeexpiryjob.h | 66 +
lang/qt/src/qgpgmechangeownertrustjob.cpp | 77 +
lang/qt/src/qgpgmechangeownertrustjob.h | 65 +
lang/qt/src/qgpgmechangepasswdjob.cpp | 79 +
lang/qt/src/qgpgmechangepasswdjob.h | 66 +
lang/qt/src/qgpgmedecryptjob.cpp | 128 ++
lang/qt/src/qgpgmedecryptjob.h | 84 +
lang/qt/src/qgpgmedecryptverifyjob.cpp | 135 ++
lang/qt/src/qgpgmedecryptverifyjob.h | 89 +
lang/qt/src/qgpgmedeletejob.cpp | 65 +
lang/qt/src/qgpgmedeletejob.h | 71 +
lang/qt/src/qgpgmedownloadjob.cpp | 100 +
lang/qt/src/qgpgmedownloadjob.h | 69 +
lang/qt/src/qgpgmeencryptjob.cpp | 160 ++
lang/qt/src/qgpgmeencryptjob.h | 99 +
lang/qt/src/qgpgmeexportjob.cpp | 76 +
lang/qt/src/qgpgmeexportjob.h | 66 +
lang/qt/src/qgpgmeimportfromkeyserverjob.cpp | 82 +
lang/qt/src/qgpgmeimportfromkeyserverjob.h | 81 +
lang/qt/src/qgpgmeimportjob.cpp | 85 +
lang/qt/src/qgpgmeimportjob.h | 81 +
lang/qt/src/qgpgmekeygenerationjob.cpp | 71 +
lang/qt/src/qgpgmekeygenerationjob.h | 72 +
lang/qt/src/qgpgmekeylistjob.cpp | 167 ++
lang/qt/src/qgpgmekeylistjob.h | 87 +
lang/qt/src/qgpgmelistallkeysjob.cpp | 168 ++
lang/qt/src/qgpgmelistallkeysjob.h | 86 +
lang/qt/src/qgpgmenewcryptoconfig.cpp | 738 +++++++
lang/qt/src/qgpgmenewcryptoconfig.h | 189 ++
lang/qt/src/qgpgmerefreshkeysjob.cpp | 225 ++
lang/qt/src/qgpgmerefreshkeysjob.h | 79 +
lang/qt/src/qgpgmesecretkeyexportjob.cpp | 142 ++
lang/qt/src/qgpgmesecretkeyexportjob.h | 81 +
lang/qt/src/qgpgmesignencryptjob.cpp | 159 ++
lang/qt/src/qgpgmesignencryptjob.h | 109 +
lang/qt/src/qgpgmesignjob.cpp | 163 ++
lang/qt/src/qgpgmesignjob.h | 101 +
lang/qt/src/qgpgmesignkeyjob.cpp | 127 ++
lang/qt/src/qgpgmesignkeyjob.h | 94 +
lang/qt/src/qgpgmeverifydetachedjob.cpp | 118 ++
lang/qt/src/qgpgmeverifydetachedjob.h | 85 +
lang/qt/src/qgpgmeverifyopaquejob.cpp | 125 ++
lang/qt/src/qgpgmeverifyopaquejob.h | 84 +
lang/qt/src/refreshkeysjob.h | 93 +
lang/qt/src/signencryptjob.h | 135 ++
lang/qt/src/signjob.h | 122 ++
lang/qt/src/signkeyjob.h | 117 +
lang/qt/src/specialjob.h | 90 +
lang/qt/src/threadedjobmixin.cpp | 110 +
lang/qt/src/threadedjobmixin.h | 272 +++
lang/qt/src/verifydetachedjob.h | 98 +
lang/qt/src/verifyopaquejob.h | 101 +
lang/qt/tests/Makefile.am | 72 +
lang/qt/tests/initial.test | 2 +
lang/qt/tests/t-keylist.cpp | 54 +
m4/ax_cxx_compile_stdcxx.m4 | 562 +++++
m4/qt.m4 | 56 +
src/Makefile.am | 33 +-
src/kdpipeiodevice.cpp | 951 ---------
src/kdpipeiodevice.h | 73 -
src/kdpipeiodevice.moc | 183 --
src/w32-qt-io.cpp | 700 ------
180 files changed, 25621 insertions(+), 1964 deletions(-)
--
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