diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-25 14:10:21 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-26 09:01:26 +0200 |
commit | 63b042fb219a42194485e152acf6d305e4594c5c (patch) | |
tree | 1fc9ddb37dc81ea6fe1e644aa92a3ac9a823f92b /src/widgets/styles/qcommonstyle.cpp | |
parent | a7dc1e280bdb63f893c720947f05ce5e24893f6f (diff) |
QtWidgets: stop using QLatin1Char constructor for creating char literals
Required for porting away from QLatin1Char/QLatin1String in scope of
QTBUG-98434.
As a drive-by, fix qsizetype -> int narrowing conversion warnings for
the touched lines.
Change-Id: I133b80334b66e0a5ab9546dd8e1ff0631e79601e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/widgets/styles/qcommonstyle.cpp')
-rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index f324925607..22f7746c93 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -4391,7 +4391,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex case SC_GroupBoxLabel: { QFontMetrics fontMetrics = groupBox->fontMetrics; int th = fontMetrics.height(); - int tw = fontMetrics.size(Qt::TextShowMnemonic, groupBox->text + QLatin1Char(' ')).width(); + int tw = fontMetrics.size(Qt::TextShowMnemonic, groupBox->text + u' ').width(); int marg = (groupBox->features & QStyleOptionFrame::Flat) ? 0 : 8; ret = groupBox->rect.adjusted(marg, 0, -marg, 0); @@ -4926,7 +4926,7 @@ QSize QCommonStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, h = qMax(h, mi->icon.actualSize(QSize(iconExtent, iconExtent)).height() + 4); } } - if (mi->text.contains(QLatin1Char('\t'))) + if (mi->text.contains(u'\t')) w += 12; if (maxpmw > 0) w += maxpmw + 6; |