aboutsummaryrefslogtreecommitdiffstats
path: root/lang/qt/src/qgpgmesecretkeyexportjob.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/qgpgmesecretkeyexportjob.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/qgpgmesecretkeyexportjob.cpp')
-rw-r--r--lang/qt/src/qgpgmesecretkeyexportjob.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lang/qt/src/qgpgmesecretkeyexportjob.cpp b/lang/qt/src/qgpgmesecretkeyexportjob.cpp
index 0a410179..d77a50ab 100644
--- a/lang/qt/src/qgpgmesecretkeyexportjob.cpp
+++ b/lang/qt/src/qgpgmesecretkeyexportjob.cpp
@@ -52,8 +52,8 @@
#include <assert.h>
QGpgME::QGpgMESecretKeyExportJob::QGpgMESecretKeyExportJob(bool armour, const QString &charset)
- : ExportJob(0),
- mProcess(0),
+ : ExportJob(nullptr),
+ mProcess(nullptr),
mError(0),
mArmour(armour),
mCharset(charset)
@@ -114,7 +114,7 @@ void QGpgME::QGpgMESecretKeyExportJob::slotCancel()
if (mProcess) {
mProcess->kill();
}
- mProcess = 0;
+ mProcess = nullptr;
mError = GpgME::Error::fromCode(GPG_ERR_CANCELED, GPG_ERR_SOURCE_GPGSM);
}