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/keygenerationresult.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lang/cpp/src/keygenerationresult.cpp') diff --git a/lang/cpp/src/keygenerationresult.cpp b/lang/cpp/src/keygenerationresult.cpp index ebbb3b99..49342f42 100644 --- a/lang/cpp/src/keygenerationresult.cpp +++ b/lang/cpp/src/keygenerationresult.cpp @@ -50,7 +50,7 @@ public: if (res.fpr) { std::free(res.fpr); } - res.fpr = 0; + res.fpr = nullptr; } _gpgme_op_genkey_result res; @@ -94,5 +94,5 @@ bool GpgME::KeyGenerationResult::isSubkeyGenerated() const const char *GpgME::KeyGenerationResult::fingerprint() const { - return d ? d->res.fpr : 0 ; + return d ? d->res.fpr : nullptr ; } -- cgit v1.2.3