gpgme/lang/cpp/src
Ingo Klöcker d911a15364 cpp: Allow merging the results of two imports
* lang/cpp/src/importresult.h, lang/cpp/src/importresult.cpp (class
ImportResult): Add member function mergeWith.
--

This allows creating a consolidated result of several independent
imports. If the import results to merge considered the same keys, then
not all counts can be consolidated correctly, but the important numbers
like the number of considered keys, the number of imported keys, the
number of unchanged keys and the numbers of new user IDs, subkeys,
signatures and revocations should be correct.

GnuPG-bug-id: 5951
2022-05-04 12:37:47 +02:00
..
interfaces Add Assuan transaction that forwards status lines to another object 2020-10-23 13:50:16 +02:00
callbacks.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
callbacks.h qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
configuration.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
configuration.h qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
context_glib.cpp qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
context_p.h qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
context_qt.cpp qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
context_vanilla.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
context.cpp cpp: Add RAII class for saving/restoring the key list mode 2022-05-02 15:51:44 +02:00
context.h cpp: Add RAII class for saving/restoring the key list mode 2022-05-02 15:51:44 +02:00
data_p.h qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
data.cpp Revert "cpp: Use portable off_t size_t" 2020-11-20 10:10:32 +01:00
data.h Revert "cpp: Use portable off_t size_t" 2020-11-20 10:10:32 +01:00
decryptionresult.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
decryptionresult.h cpp: Add legacy_cipher_nomdc 2018-06-01 10:58:24 +02:00
defaultassuantransaction.cpp qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
defaultassuantransaction.h qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
editinteractor.cpp cpp: Handle canceling of an edit operation 2022-04-05 10:17:39 +02:00
editinteractor.h cpp: Return actual error if revocation fails 2022-04-05 10:15:07 +02:00
encryptionresult.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
encryptionresult.h qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
engineinfo.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
engineinfo.h cpp, qt: Add missing comparison operators for version info comparison 2020-10-23 13:50:16 +02:00
error.h qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
eventloopinteractor.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
eventloopinteractor.h qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
exception.cpp qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
exception.h qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
global.h cpp: Support new keylist modes 2022-04-27 17:21:04 +02:00
gpgaddexistingsubkeyeditinteractor.cpp cpp: Add interactor to add existing subkeys to other keys 2022-01-12 16:38:58 +01:00
gpgaddexistingsubkeyeditinteractor.h cpp: Add interactor to add existing subkeys to other keys 2022-01-12 16:38:58 +01:00
gpgadduserideditinteractor.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
gpgadduserideditinteractor.h qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
gpgagentgetinfoassuantransaction.cpp qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
gpgagentgetinfoassuantransaction.h qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
gpggencardkeyinteractor.cpp cpp: Fix initialization warning 2019-05-03 08:49:34 +02:00
gpggencardkeyinteractor.h cpp: Fix GenCardKeyInteractor and extend it 2019-03-26 12:02:28 +01:00
gpgmefw.h qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
gpgmepp_export.h Change copyright from Intevation to BSI 2017-04-25 10:24:11 +02:00
gpgmepp_version.h.in qt, cpp: Fix versioning in cmake config and header 2016-11-02 14:43:44 +01:00
GpgmeppConfig-w32.cmake.in.in qt, cpp: Add cmake config files for w32 2016-11-15 14:33:31 +01:00
GpgmeppConfig.cmake.in.in cpp: Fix CMake config library name for GPGME 2017-06-12 15:25:33 +02:00
GpgmeppConfigVersion.cmake.in qt, cpp: Fix versioning in cmake config and header 2016-11-02 14:43:44 +01:00
gpgrevokekeyeditinteractor.cpp cpp: Return actual error if revocation fails 2022-04-05 10:15:07 +02:00
gpgrevokekeyeditinteractor.h cpp: Do not export symbols of the Private class 2022-04-05 10:05:43 +02:00
gpgsetexpirytimeeditinteractor.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
gpgsetexpirytimeeditinteractor.h qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
gpgsetownertrusteditinteractor.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
gpgsetownertrusteditinteractor.h qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
gpgsignkeyeditinteractor.cpp cpp: Add support for trust signatures to sign key edit interactor 2021-05-05 19:26:03 +02:00
gpgsignkeyeditinteractor.h cpp: Add support for trust signatures to sign key edit interactor 2021-05-05 19:26:03 +02:00
importresult.cpp cpp: Allow merging the results of two imports 2022-05-04 12:37:47 +02:00
importresult.h cpp: Allow merging the results of two imports 2022-05-04 12:37:47 +02:00
key.cpp cpp: Add getters for the attributes of a trust signature 2021-05-05 19:25:48 +02:00
key.h cpp: Add getters for the attributes of a trust signature 2021-05-05 19:25:48 +02:00
keygenerationresult.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
keygenerationresult.h qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
keylistresult.cpp qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
keylistresult.h qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
Makefile.am cpp: Add interactor to revoke a key 2022-03-30 12:05:26 +02:00
notation.h qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
result_p.h qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
result.h cpp: Allow changing the error of a result 2022-04-22 17:30:59 +02:00
scdgetinfoassuantransaction.cpp qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
scdgetinfoassuantransaction.h qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
signingresult.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
signingresult.h qt, cpp: Add additional copyright BSI notes 2017-04-25 13:03:49 +02:00
statusconsumerassuantransaction.cpp Add Assuan transaction that forwards status lines to another object 2020-10-23 13:50:16 +02:00
statusconsumerassuantransaction.h Add Assuan transaction that forwards status lines to another object 2020-10-23 13:50:16 +02:00
swdbresult.cpp Change copyright from Intevation to BSI 2017-04-25 10:24:11 +02:00
swdbresult.h Spelling fixes for comments and doc 2017-12-08 05:59:11 +01:00
tofuinfo.cpp Change copyright from Intevation to BSI 2017-04-25 10:24:11 +02:00
tofuinfo.h Change copyright from Intevation to BSI 2017-04-25 10:24:11 +02:00
trustitem.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
trustitem.h qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
util.cpp cpp: Add internal adapter for passing a vector of strings to gpgme 2022-02-03 15:56:30 +01:00
util.h cpp: Support new keylist modes 2022-04-27 17:21:04 +02:00
verificationresult.cpp core: New keylist mode GPGME_KEYLIST_MODE_WITH_KEYGRIP. 2020-07-15 14:11:17 +02:00
verificationresult.h Add flag 'is_de_vs' to decryption results and signatures. 2017-06-01 14:16:11 +02:00
vfsmountresult.cpp qt,cpp: Consistently use nullptr and override 2018-12-03 12:25:00 +01:00
vfsmountresult.h cpp: Get rid of AssuanResult due to its deprecation. 2016-08-24 14:15:58 +02:00