diff options
| author | Ben McGinnes <[email protected]> | 2018-12-04 21:49:41 +0000 |
|---|---|---|
| committer | Ben McGinnes <[email protected]> | 2018-12-04 21:49:41 +0000 |
| commit | 8d2621fcad3ded2a4184c00a04ca1002b4de98cc (patch) | |
| tree | c80dde4d38e975b58454046303c286b60f4556bf /lang/qt/src/qgpgmesecretkeyexportjob.cpp | |
| parent | python: docs update (diff) | |
| parent | build: Remove --with-*-prefix, which is no need any more. (diff) | |
| download | gpgme-8d2621fcad3ded2a4184c00a04ca1002b4de98cc.tar.gz gpgme-8d2621fcad3ded2a4184c00a04ca1002b4de98cc.zip | |
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
Diffstat (limited to 'lang/qt/src/qgpgmesecretkeyexportjob.cpp')
| -rw-r--r-- | lang/qt/src/qgpgmesecretkeyexportjob.cpp | 6 |
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); } |
