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/threadedjobmixin.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/threadedjobmixin.cpp')
| -rw-r--r-- | lang/qt/src/threadedjobmixin.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lang/qt/src/threadedjobmixin.cpp b/lang/qt/src/threadedjobmixin.cpp index cd7c494f..d5399f7b 100644 --- a/lang/qt/src/threadedjobmixin.cpp +++ b/lang/qt/src/threadedjobmixin.cpp @@ -164,13 +164,13 @@ static QList<QByteArray> single(const QByteArray &ba) } _detail::PatternConverter::PatternConverter(const QByteArray &ba) - : m_list(single(ba)), m_patterns(0) {} + : m_list(single(ba)), m_patterns(nullptr) {} _detail::PatternConverter::PatternConverter(const QString &s) - : m_list(single(s.toUtf8())), m_patterns(0) {} + : m_list(single(s.toUtf8())), m_patterns(nullptr) {} _detail::PatternConverter::PatternConverter(const QList<QByteArray> &lba) - : m_list(lba), m_patterns(0) {} + : m_list(lba), m_patterns(nullptr) {} _detail::PatternConverter::PatternConverter(const QStringList &sl) - : m_list(from_sl(sl)), m_patterns(0) {} + : m_list(from_sl(sl)), m_patterns(nullptr) {} const char **_detail::PatternConverter::patterns() const { @@ -178,7 +178,7 @@ const char **_detail::PatternConverter::patterns() const m_patterns = new const char *[ m_list.size() + 1 ]; const char **end = std::transform(m_list.begin(), m_list.end(), m_patterns, std::mem_fn(&QByteArray::constData)); - *end = 0; + *end = nullptr; } return m_patterns; } |