From 499ec43937e926e4f2fa57a9baa455fcb3862262 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 21 Feb 2018 10:41:54 +0100 Subject: use nullptr consistently (clang-tidy) From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann --- examples/qml/qmlextensionplugins/plugin.cpp | 4 ++-- examples/qml/referenceexamples/attached/birthdayparty.cpp | 2 +- examples/qml/referenceexamples/binding/birthdayparty.cpp | 2 +- examples/qml/referenceexamples/coercion/birthdayparty.cpp | 2 +- examples/qml/referenceexamples/default/birthdayparty.cpp | 2 +- examples/qml/referenceexamples/grouped/birthdayparty.cpp | 2 +- examples/qml/referenceexamples/grouped/main.cpp | 2 +- examples/qml/referenceexamples/methods/birthdayparty.cpp | 2 +- examples/qml/referenceexamples/properties/birthdayparty.cpp | 2 +- examples/qml/referenceexamples/signal/birthdayparty.cpp | 2 +- examples/qml/referenceexamples/valuesource/birthdayparty.cpp | 2 +- .../tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp | 2 +- .../qml/tutorials/extending-qml/chapter5-listproperties/piechart.cpp | 2 +- .../qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) (limited to 'examples/qml') diff --git a/examples/qml/qmlextensionplugins/plugin.cpp b/examples/qml/qmlextensionplugins/plugin.cpp index c00c7bc015..3ef7f04f95 100644 --- a/examples/qml/qmlextensionplugins/plugin.cpp +++ b/examples/qml/qmlextensionplugins/plugin.cpp @@ -115,7 +115,7 @@ class TimeModel : public QObject //![0] public: - TimeModel(QObject *parent=0) : QObject(parent) + TimeModel(QObject *parent=nullptr) : QObject(parent) { if (++instances == 1) { if (!timer) @@ -145,7 +145,7 @@ private: }; int TimeModel::instances=0; -MinuteTimer *TimeModel::timer=0; +MinuteTimer *TimeModel::timer=nullptr; //![plugin] class QExampleQmlPlugin : public QQmlExtensionPlugin diff --git a/examples/qml/referenceexamples/attached/birthdayparty.cpp b/examples/qml/referenceexamples/attached/birthdayparty.cpp index 2594fea641..26aa56e86c 100644 --- a/examples/qml/referenceexamples/attached/birthdayparty.cpp +++ b/examples/qml/referenceexamples/attached/birthdayparty.cpp @@ -65,7 +65,7 @@ void BirthdayPartyAttached::setRsvp(const QDate &d) } BirthdayParty::BirthdayParty(QObject *parent) -: QObject(parent), m_host(0) +: QObject(parent), m_host(nullptr) { } diff --git a/examples/qml/referenceexamples/binding/birthdayparty.cpp b/examples/qml/referenceexamples/binding/birthdayparty.cpp index d30674a92d..866c1f6968 100644 --- a/examples/qml/referenceexamples/binding/birthdayparty.cpp +++ b/examples/qml/referenceexamples/binding/birthdayparty.cpp @@ -69,7 +69,7 @@ void BirthdayPartyAttached::setRsvp(const QDate &d) BirthdayParty::BirthdayParty(QObject *parent) -: QObject(parent), m_host(0) +: QObject(parent), m_host(nullptr) { } diff --git a/examples/qml/referenceexamples/coercion/birthdayparty.cpp b/examples/qml/referenceexamples/coercion/birthdayparty.cpp index fd6995597b..e729c42bb5 100644 --- a/examples/qml/referenceexamples/coercion/birthdayparty.cpp +++ b/examples/qml/referenceexamples/coercion/birthdayparty.cpp @@ -50,7 +50,7 @@ #include "birthdayparty.h" BirthdayParty::BirthdayParty(QObject *parent) -: QObject(parent), m_host(0) +: QObject(parent), m_host(nullptr) { } diff --git a/examples/qml/referenceexamples/default/birthdayparty.cpp b/examples/qml/referenceexamples/default/birthdayparty.cpp index fd6995597b..e729c42bb5 100644 --- a/examples/qml/referenceexamples/default/birthdayparty.cpp +++ b/examples/qml/referenceexamples/default/birthdayparty.cpp @@ -50,7 +50,7 @@ #include "birthdayparty.h" BirthdayParty::BirthdayParty(QObject *parent) -: QObject(parent), m_host(0) +: QObject(parent), m_host(nullptr) { } diff --git a/examples/qml/referenceexamples/grouped/birthdayparty.cpp b/examples/qml/referenceexamples/grouped/birthdayparty.cpp index fd6995597b..e729c42bb5 100644 --- a/examples/qml/referenceexamples/grouped/birthdayparty.cpp +++ b/examples/qml/referenceexamples/grouped/birthdayparty.cpp @@ -50,7 +50,7 @@ #include "birthdayparty.h" BirthdayParty::BirthdayParty(QObject *parent) -: QObject(parent), m_host(0) +: QObject(parent), m_host(nullptr) { } diff --git a/examples/qml/referenceexamples/grouped/main.cpp b/examples/qml/referenceexamples/grouped/main.cpp index 8a137b0380..17dcd09c34 100644 --- a/examples/qml/referenceexamples/grouped/main.cpp +++ b/examples/qml/referenceexamples/grouped/main.cpp @@ -76,7 +76,7 @@ int main(int argc, char ** argv) else qWarning() << "She is inviting:"; - Person *bestShoe = 0; + Person *bestShoe = nullptr; for (int ii = 0; ii < party->guestCount(); ++ii) { Person *guest = party->guest(ii); qWarning() << " " << guest->name(); diff --git a/examples/qml/referenceexamples/methods/birthdayparty.cpp b/examples/qml/referenceexamples/methods/birthdayparty.cpp index 7f2a2cc153..dfb36257eb 100644 --- a/examples/qml/referenceexamples/methods/birthdayparty.cpp +++ b/examples/qml/referenceexamples/methods/birthdayparty.cpp @@ -50,7 +50,7 @@ #include "birthdayparty.h" BirthdayParty::BirthdayParty(QObject *parent) -: QObject(parent), m_host(0) +: QObject(parent), m_host(nullptr) { } diff --git a/examples/qml/referenceexamples/properties/birthdayparty.cpp b/examples/qml/referenceexamples/properties/birthdayparty.cpp index 1cb79c8b1b..8a5e9e553e 100644 --- a/examples/qml/referenceexamples/properties/birthdayparty.cpp +++ b/examples/qml/referenceexamples/properties/birthdayparty.cpp @@ -50,7 +50,7 @@ #include "birthdayparty.h" BirthdayParty::BirthdayParty(QObject *parent) -: QObject(parent), m_host(0) +: QObject(parent), m_host(nullptr) { } diff --git a/examples/qml/referenceexamples/signal/birthdayparty.cpp b/examples/qml/referenceexamples/signal/birthdayparty.cpp index c0e4f177e5..a5fbb742a5 100644 --- a/examples/qml/referenceexamples/signal/birthdayparty.cpp +++ b/examples/qml/referenceexamples/signal/birthdayparty.cpp @@ -66,7 +66,7 @@ void BirthdayPartyAttached::setRsvp(const QDate &d) BirthdayParty::BirthdayParty(QObject *parent) -: QObject(parent), m_host(0) +: QObject(parent), m_host(nullptr) { } diff --git a/examples/qml/referenceexamples/valuesource/birthdayparty.cpp b/examples/qml/referenceexamples/valuesource/birthdayparty.cpp index beb59315ea..b107c61570 100644 --- a/examples/qml/referenceexamples/valuesource/birthdayparty.cpp +++ b/examples/qml/referenceexamples/valuesource/birthdayparty.cpp @@ -66,7 +66,7 @@ void BirthdayPartyAttached::setRsvp(const QDate &d) BirthdayParty::BirthdayParty(QObject *parent) -: QObject(parent), m_host(0) +: QObject(parent), m_host(nullptr) { } diff --git a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp index 0107a1fc69..066963cf33 100644 --- a/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp +++ b/examples/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.cpp @@ -51,7 +51,7 @@ #include "pieslice.h" PieChart::PieChart(QQuickItem *parent) - : QQuickItem(parent), m_pieSlice(0) + : QQuickItem(parent), m_pieSlice(nullptr) { } diff --git a/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.cpp index 699fce14ca..ac680bb9c9 100644 --- a/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.cpp +++ b/examples/qml/tutorials/extending-qml/chapter5-listproperties/piechart.cpp @@ -68,7 +68,7 @@ void PieChart::setName(const QString &name) //![0] QQmlListProperty PieChart::slices() { - return QQmlListProperty(this, 0, &PieChart::append_slice, 0, 0, 0); + return QQmlListProperty(this, nullptr, &PieChart::append_slice, nullptr, nullptr, nullptr); } void PieChart::append_slice(QQmlListProperty *list, PieSlice *slice) diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp index 40b31b32de..1c712c887a 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp @@ -67,7 +67,7 @@ void PieChart::setName(const QString &name) QQmlListProperty PieChart::slices() { - return QQmlListProperty(this, 0, &PieChart::append_slice, 0, 0, 0); + return QQmlListProperty(this, nullptr, &PieChart::append_slice, nullptr, nullptr, nullptr); } void PieChart::append_slice(QQmlListProperty *list, PieSlice *slice) -- cgit v1.2.3