aboutsummaryrefslogtreecommitdiffstats
path: root/lang/cpp/src/importresult.cpp
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2018-12-03 11:20:33 +0000
committerAndre Heinecke <[email protected]>2018-12-03 11:25:00 +0000
commit1d31420650bfa7ca1d1503cc7431b3360e86022c (patch)
tree3155599aae033d00696c12c55459ecbe1b92b598 /lang/cpp/src/importresult.cpp
parentdoc: Minor comment cleanups. (diff)
downloadgpgme-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/importresult.cpp')
-rw-r--r--lang/cpp/src/importresult.cpp8
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