From 1d31420650bfa7ca1d1503cc7431b3360e86022c Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Mon, 3 Dec 2018 12:20:33 +0100 Subject: 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. --- lang/cpp/src/signingresult.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lang/cpp/src/signingresult.cpp') diff --git a/lang/cpp/src/signingresult.cpp b/lang/cpp/src/signingresult.cpp index 6a5231ff..6e0dd90a 100644 --- a/lang/cpp/src/signingresult.cpp +++ b/lang/cpp/src/signingresult.cpp @@ -53,7 +53,7 @@ public: if (is->fpr) { copy->fpr = strdup(is->fpr); } - copy->next = 0; + copy->next = nullptr; created.push_back(copy); } for (gpgme_invalid_key_t ik = r->invalid_signers ; ik ; ik = ik->next) { @@ -61,7 +61,7 @@ public: if (ik->fpr) { copy->fpr = strdup(ik->fpr); } - copy->next = 0; + copy->next = nullptr; invalid.push_back(copy); } } @@ -69,11 +69,11 @@ public: { for (std::vector::iterator it = created.begin() ; it != created.end() ; ++it) { std::free((*it)->fpr); - delete *it; *it = 0; + delete *it; *it = nullptr; } for (std::vector::iterator it = invalid.begin() ; it != invalid.end() ; ++it) { std::free((*it)->fpr); - delete *it; *it = 0; + delete *it; *it = nullptr; } } @@ -158,7 +158,7 @@ bool GpgME::InvalidSigningKey::isNull() const const char *GpgME::InvalidSigningKey::fingerprint() const { - return isNull() ? 0 : d->invalid[idx]->fpr ; + return isNull() ? nullptr : d->invalid[idx]->fpr ; } GpgME::Error GpgME::InvalidSigningKey::reason() const @@ -181,7 +181,7 @@ bool GpgME::CreatedSignature::isNull() const const char *GpgME::CreatedSignature::fingerprint() const { - return isNull() ? 0 : d->created[idx]->fpr ; + return isNull() ? nullptr : d->created[idx]->fpr ; } time_t GpgME::CreatedSignature::creationTime() const -- cgit v1.2.3