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 /tests/auto/qml/qqmllocale | |
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 'tests/auto/qml/qqmllocale')
-rw-r--r-- | tests/auto/qml/qqmllocale/tst_qqmllocale.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp index 4f4deaafe5..c2c2413c98 100644 --- a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp +++ b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp @@ -152,7 +152,7 @@ void tst_qqmllocale::addPropertyData(const QString &l) LOCALE_PROP(QString,exponential), LOCALE_PROP(int,measurementSystem), LOCALE_PROP(int,textDirection), - { 0, QVariant() } + { nullptr, QVariant() } }; int i = 0; @@ -663,7 +663,7 @@ void tst_qqmllocale::addDateTimeFormatData(const QString &l) "h:m:sap ddd MMMM d yy", "'The date and time is: 'H:mm:ss:zzz dd/MM/yy", "MMM d yyyy HH:mm t", - 0 + nullptr }; QByteArray locale = l.toLatin1(); int i = 0; @@ -751,7 +751,7 @@ void tst_qqmllocale::addDateFormatData(const QString &l) "ddd MMMM d yy", "'The date is: 'dd/MM/yy", "MMM d yyyy", - 0 + nullptr }; QByteArray locale = l.toLatin1(); int i = 0; @@ -839,7 +839,7 @@ void tst_qqmllocale::addTimeFormatData(const QString &l) "h:m:sap", "'The time is: 'H:mm:ss:zzz", "HH:mm t", - 0 + nullptr }; QByteArray locale = l.toLatin1(); int i = 0; |