diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-21 10:41:54 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-26 07:13:18 +0000 |
| commit | 499ec43937e926e4f2fa57a9baa455fcb3862262 (patch) | |
| tree | 206c90d47387f8322b68f5e3db613189397e1af3 /examples/qml/qmlextensionplugins | |
| parent | 53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff) | |
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 <simon.hausmann@qt.io>
Diffstat (limited to 'examples/qml/qmlextensionplugins')
| -rw-r--r-- | examples/qml/qmlextensionplugins/plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |