aboutsummaryrefslogtreecommitdiffstats
path: root/lang/qt/src/qgpgmebackend.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/qt/src/qgpgmebackend.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/qt/src/qgpgmebackend.cpp')
-rw-r--r--lang/qt/src/qgpgmebackend.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/lang/qt/src/qgpgmebackend.cpp b/lang/qt/src/qgpgmebackend.cpp
index 89f7b559..f7393f09 100644
--- a/lang/qt/src/qgpgmebackend.cpp
+++ b/lang/qt/src/qgpgmebackend.cpp
@@ -52,18 +52,18 @@ const char QGpgME::QGpgMEBackend::SMIME[] = "SMIME";
QGpgME::QGpgMEBackend::QGpgMEBackend()
- : mCryptoConfig(0),
- mOpenPGPProtocol(0),
- mSMIMEProtocol(0)
+ : mCryptoConfig(nullptr),
+ mOpenPGPProtocol(nullptr),
+ mSMIMEProtocol(nullptr)
{
GpgME::initializeLibrary();
}
QGpgME::QGpgMEBackend::~QGpgMEBackend()
{
- delete mCryptoConfig; mCryptoConfig = 0;
- delete mOpenPGPProtocol; mOpenPGPProtocol = 0;
- delete mSMIMEProtocol; mSMIMEProtocol = 0;
+ delete mCryptoConfig; mCryptoConfig = nullptr;
+ delete mOpenPGPProtocol; mOpenPGPProtocol = nullptr;
+ delete mSMIMEProtocol; mSMIMEProtocol = nullptr;
}
QString QGpgME::QGpgMEBackend::name() const
@@ -163,7 +163,7 @@ QGpgME::Protocol *QGpgME::QGpgMEBackend::protocol(const char *name) const
if (qstricmp(name, SMIME) == 0) {
return smime();
}
- return 0;
+ return nullptr;
}
bool QGpgME::QGpgMEBackend::supportsProtocol(const char *name) const
@@ -176,7 +176,7 @@ const char *QGpgME::QGpgMEBackend::enumerateProtocols(int i) const
switch (i) {
case 0: return OpenPGP;
case 1: return SMIME;
- default: return 0;
+ default: return nullptr;
}
}