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/data.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/data.cpp')
-rw-r--r-- | lang/cpp/src/data.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lang/cpp/src/data.cpp b/lang/cpp/src/data.cpp index 2782aa79..547ec76e 100644 --- a/lang/cpp/src/data.cpp +++ b/lang/cpp/src/data.cpp @@ -48,11 +48,11 @@ GpgME::Data::Data() { gpgme_data_t data; const gpgme_error_t e = gpgme_data_new(&data); - d.reset(new Private(e ? 0 : data)); + d.reset(new Private(e ? nullptr : data)); } GpgME::Data::Data(const Null &) - : d(new Private(0)) + : d(new Private(nullptr)) { } @@ -70,14 +70,14 @@ GpgME::Data::Data(const char *buffer, size_t size, bool copy) std::string sizestr = std::to_string(size); // Ignore errors as this is optional gpgme_data_set_flag(data, "size-hint", sizestr.c_str()); - d.reset(new Private(e ? 0 : data)); + d.reset(new Private(e ? nullptr : data)); } GpgME::Data::Data(const char *filename) { gpgme_data_t data; const gpgme_error_t e = gpgme_data_new(&data); - d.reset(new Private(e ? 0 : data)); + d.reset(new Private(e ? nullptr : data)); if (!e) { setFileName(filename); } @@ -86,29 +86,29 @@ GpgME::Data::Data(const char *filename) GpgME::Data::Data(const char *filename, off_t offset, size_t length) { gpgme_data_t data; - const gpgme_error_t e = gpgme_data_new_from_filepart(&data, filename, 0, offset, length); - d.reset(new Private(e ? 0 : data)); + const gpgme_error_t e = gpgme_data_new_from_filepart(&data, filename, nullptr, offset, length); + d.reset(new Private(e ? nullptr : data)); } GpgME::Data::Data(FILE *fp) { gpgme_data_t data; const gpgme_error_t e = gpgme_data_new_from_stream(&data, fp); - d.reset(new Private(e ? 0 : data)); + d.reset(new Private(e ? nullptr : data)); } GpgME::Data::Data(FILE *fp, off_t offset, size_t length) { gpgme_data_t data; - const gpgme_error_t e = gpgme_data_new_from_filepart(&data, 0, fp, offset, length); - d.reset(new Private(e ? 0 : data)); + const gpgme_error_t e = gpgme_data_new_from_filepart(&data, nullptr, fp, offset, length); + d.reset(new Private(e ? nullptr : data)); } GpgME::Data::Data(int fd) { gpgme_data_t data; const gpgme_error_t e = gpgme_data_new_from_fd(&data, fd); - d.reset(new Private(e ? 0 : data)); + d.reset(new Private(e ? nullptr : data)); } GpgME::Data::Data(DataProvider *dp) @@ -118,20 +118,20 @@ GpgME::Data::Data(DataProvider *dp) return; } if (!dp->isSupported(DataProvider::Read)) { - d->cbs.read = 0; + d->cbs.read = nullptr; } if (!dp->isSupported(DataProvider::Write)) { - d->cbs.write = 0; + d->cbs.write = nullptr; } if (!dp->isSupported(DataProvider::Seek)) { - d->cbs.seek = 0; + d->cbs.seek = nullptr; } if (!dp->isSupported(DataProvider::Release)) { - d->cbs.release = 0; + d->cbs.release = nullptr; } const gpgme_error_t e = gpgme_data_new_from_cbs(&d->data, &d->cbs, dp); if (e) { - d->data = 0; + d->data = nullptr; } if (dp->isSupported(DataProvider::Seek)) { off_t size = seek(0, SEEK_END); |