diff options
author | Andre Heinecke <[email protected]> | 2018-12-03 11:20:33 +0000 |
---|---|---|
committer | Andre Heinecke <[email protected]> | 2018-12-03 11:25:00 +0000 |
commit | 1d31420650bfa7ca1d1503cc7431b3360e86022c (patch) | |
tree | 3155599aae033d00696c12c55459ecbe1b92b598 /lang/cpp/src/encryptionresult.cpp | |
parent | doc: Minor comment cleanups. (diff) | |
download | gpgme-1d31420650bfa7ca1d1503cc7431b3360e86022c.tar.gz gpgme-1d31420650bfa7ca1d1503cc7431b3360e86022c.zip |
qt,cpp: Consistently use nullptr and override
* lang/cpp/src/Makefile.am, lang/qt/src/Makefile.am (AM_CPPFLAGS):
Add suggest-override and zero-as-null-pointer-constant warnings.
* lang/cpp/src/*, lang/qt/src/*: Consistenly use nullptr and override.
--
This was especially important for the headers so that downstream
users of GpgME++ or QGpgME do not get flooded by warnings if
they have these warnings enabled.
It also improves compiler errors/warnings in case of accidental
mistakes.
Diffstat (limited to 'lang/cpp/src/encryptionresult.cpp')
-rw-r--r-- | lang/cpp/src/encryptionresult.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lang/cpp/src/encryptionresult.cpp b/lang/cpp/src/encryptionresult.cpp index 33365cd4..95dcb22e 100644 --- a/lang/cpp/src/encryptionresult.cpp +++ b/lang/cpp/src/encryptionresult.cpp @@ -53,7 +53,7 @@ public: if (ik->fpr) { copy->fpr = strdup(ik->fpr); } - copy->next = 0; + copy->next = nullptr; invalid.push_back(copy); } } @@ -61,7 +61,7 @@ public: { for (std::vector<gpgme_invalid_key_t>::iterator it = invalid.begin() ; it != invalid.end() ; ++it) { std::free((*it)->fpr); - delete *it; *it = 0; + delete *it; *it = nullptr; } } @@ -132,7 +132,7 @@ bool GpgME::InvalidRecipient::isNull() const const char *GpgME::InvalidRecipient::fingerprint() const { - return isNull() ? 0 : d->invalid[idx]->fpr ; + return isNull() ? nullptr : d->invalid[idx]->fpr ; } GpgME::Error GpgME::InvalidRecipient::reason() const |