From 1d31420650bfa7ca1d1503cc7431b3360e86022c Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Mon, 3 Dec 2018 12:20:33 +0100 Subject: 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. --- lang/qt/src/threadedjobmixin.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lang/qt/src/threadedjobmixin.cpp') 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 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 &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; } -- cgit v1.2.3