diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 11:49:52 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:55 +0000 |
| commit | 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 (patch) | |
| tree | 7f600686e4dd92681bec09ac745a9dcd4425844b /tests/auto/corelib/tools/qlatin1string | |
| parent | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (diff) | |
Replace Q_NULLPTR with nullptr where possible
Remaining uses of Q_NULLPTR are in:
src/corelib/global/qcompilerdetection.h
(definition and documentation of Q_NULLPTR)
tests/manual/qcursor/qcursorhighdpi/main.cpp
(a test executable compilable both under Qt4 and Qt5)
Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'tests/auto/corelib/tools/qlatin1string')
| -rw-r--r-- | tests/auto/corelib/tools/qlatin1string/tst_qlatin1string.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/tools/qlatin1string/tst_qlatin1string.cpp b/tests/auto/corelib/tools/qlatin1string/tst_qlatin1string.cpp index c8373b6ae9..dcfb0aa042 100644 --- a/tests/auto/corelib/tools/qlatin1string/tst_qlatin1string.cpp +++ b/tests/auto/corelib/tools/qlatin1string/tst_qlatin1string.cpp @@ -86,7 +86,7 @@ void tst_QLatin1String::nullString() // default ctor { QLatin1String l1; - QCOMPARE(static_cast<const void*>(l1.data()), static_cast<const void*>(Q_NULLPTR)); + QCOMPARE(static_cast<const void*>(l1.data()), static_cast<const void*>(nullptr)); QCOMPARE(l1.size(), 0); QString s = l1; @@ -95,9 +95,9 @@ void tst_QLatin1String::nullString() // from nullptr { - const char *null = Q_NULLPTR; + const char *null = nullptr; QLatin1String l1(null); - QCOMPARE(static_cast<const void*>(l1.data()), static_cast<const void*>(Q_NULLPTR)); + QCOMPARE(static_cast<const void*>(l1.data()), static_cast<const void*>(nullptr)); QCOMPARE(l1.size(), 0); QString s = l1; @@ -111,7 +111,7 @@ void tst_QLatin1String::nullString() QLatin1String l1(null); QEXPECT_FAIL("", "null QByteArrays become non-null QLatin1Strings...", Continue); - QCOMPARE(static_cast<const void*>(l1.data()), static_cast<const void*>(Q_NULLPTR)); + QCOMPARE(static_cast<const void*>(l1.data()), static_cast<const void*>(nullptr)); QCOMPARE(l1.size(), 0); QString s = l1; |