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/qgpgmerefreshkeysjob.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 '')
-rw-r--r-- | lang/qt/src/qgpgmerefreshkeysjob.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lang/qt/src/qgpgmerefreshkeysjob.cpp b/lang/qt/src/qgpgmerefreshkeysjob.cpp index 1ff26ecc..ae862e04 100644 --- a/lang/qt/src/qgpgmerefreshkeysjob.cpp +++ b/lang/qt/src/qgpgmerefreshkeysjob.cpp @@ -53,8 +53,8 @@ #include <assert.h> QGpgME::QGpgMERefreshKeysJob::QGpgMERefreshKeysJob() - : RefreshKeysJob(0), - mProcess(0), + : RefreshKeysJob(nullptr), + mProcess(nullptr), mError(0) { @@ -142,7 +142,7 @@ void QGpgME::QGpgMERefreshKeysJob::slotCancel() if (mProcess) { mProcess->kill(); } - mProcess = 0; + mProcess = nullptr; mError = GpgME::Error::fromCode(GPG_ERR_CANCELED, GPG_ERR_SOURCE_GPGSM); } |