diff options
| author | Ben McGinnes <[email protected]> | 2018-12-04 21:49:41 +0000 |
|---|---|---|
| committer | Ben McGinnes <[email protected]> | 2018-12-04 21:49:41 +0000 |
| commit | 8d2621fcad3ded2a4184c00a04ca1002b4de98cc (patch) | |
| tree | c80dde4d38e975b58454046303c286b60f4556bf /lang/cpp/src/importresult.cpp | |
| parent | python: docs update (diff) | |
| parent | build: Remove --with-*-prefix, which is no need any more. (diff) | |
| download | gpgme-8d2621fcad3ded2a4184c00a04ca1002b4de98cc.tar.gz gpgme-8d2621fcad3ded2a4184c00a04ca1002b4de98cc.zip | |
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
Diffstat (limited to 'lang/cpp/src/importresult.cpp')
| -rw-r--r-- | lang/cpp/src/importresult.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/cpp/src/importresult.cpp b/lang/cpp/src/importresult.cpp index dbb31d05..05943ca0 100644 --- a/lang/cpp/src/importresult.cpp +++ b/lang/cpp/src/importresult.cpp @@ -46,16 +46,16 @@ public: for (gpgme_import_status_t is = r.imports ; is ; is = is->next) { gpgme_import_status_t copy = new _gpgme_import_status(*is); copy->fpr = strdup(is->fpr); - copy->next = 0; + copy->next = nullptr; imports.push_back(copy); } - res.imports = 0; + res.imports = nullptr; } ~Private() { for (std::vector<gpgme_import_status_t>::iterator it = imports.begin() ; it != imports.end() ; ++it) { std::free((*it)->fpr); - delete *it; *it = 0; + delete *it; *it = nullptr; } } @@ -192,7 +192,7 @@ bool GpgME::Import::isNull() const const char *GpgME::Import::fingerprint() const { - return isNull() ? 0 : d->imports[idx]->fpr ; + return isNull() ? nullptr : d->imports[idx]->fpr ; } GpgME::Error GpgME::Import::error() const |