aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickstyledtext
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-02-21 10:41:54 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2018-02-26 07:13:18 +0000
commit499ec43937e926e4f2fa57a9baa455fcb3862262 (patch)
tree206c90d47387f8322b68f5e3db613189397e1af3 /tests/auto/quick/qquickstyledtext
parent53d1e9ed21d25e65a2f13606af479838f5f21fe7 (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/quick/qquickstyledtext')
-rw-r--r--tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp b/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp
index 045029c3b6..6ca5ad2653 100644
--- a/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp
+++ b/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp
@@ -162,7 +162,7 @@ void tst_qquickstyledtext::textOutput()
QTextLayout layout;
QList<QQuickStyledTextImgTag*> imgTags;
bool fontSizeModified = false;
- QQuickStyledText::parse(input, layout, imgTags, QUrl(), 0, false, &fontSizeModified);
+ QQuickStyledText::parse(input, layout, imgTags, QUrl(), nullptr, false, &fontSizeModified);
QCOMPARE(layout.text(), output);
@@ -191,7 +191,7 @@ void tst_qquickstyledtext::anchors()
QTextLayout layout;
QList<QQuickStyledTextImgTag*> imgTags;
bool fontSizeModified = false;
- QQuickStyledText::parse(input, layout, imgTags, QUrl(), 0, false, &fontSizeModified);
+ QQuickStyledText::parse(input, layout, imgTags, QUrl(), nullptr, false, &fontSizeModified);
QCOMPARE(layout.text(), output);
@@ -229,11 +229,11 @@ void tst_qquickstyledtext::longString()
bool fontSizeModified = false;
QString input(9999999, QChar('.'));
- QQuickStyledText::parse(input, layout, imgTags, QUrl(), 0, false, &fontSizeModified);
+ QQuickStyledText::parse(input, layout, imgTags, QUrl(), nullptr, false, &fontSizeModified);
QCOMPARE(layout.text(), input);
input = QString(9999999, QChar('\t')); // whitespace
- QQuickStyledText::parse(input, layout, imgTags, QUrl(), 0, false, &fontSizeModified);
+ QQuickStyledText::parse(input, layout, imgTags, QUrl(), nullptr, false, &fontSizeModified);
QCOMPARE(layout.text(), QString(""));
}