diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-04-25 16:20:08 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-05-02 09:07:23 +0200 |
commit | c48795c515f7b181c7fc6409cb3b073e6fc0c0e0 (patch) | |
tree | d148cd4c141776411cdb3a382f28124a4df9e39b /src/widgets/styles | |
parent | 7d79b94db7debdd1896d1912e3052d5950b05df5 (diff) |
QtWidgets: replace remaining uses of QL1String with QL1StringView
Task-number: QTBUG-98434
Change-Id: If20e217e6e4fecd18c7707bf94650f5ba856893f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/widgets/styles')
-rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 8 | ||||
-rw-r--r-- | src/widgets/styles/qpixmapstyle.cpp | 2 | ||||
-rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index e286895b59..5160243a91 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -734,9 +734,11 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q QRect r = opt->rect; int size = qMin(r.height(), r.width()); QPixmap pixmap; - QString pixmapName = QStyleHelper::uniqueName("$qt_ia-"_L1 - % QLatin1String(metaObject()->className()), opt, QSize(size, size)) - % HexString<uint>(pe); + QString pixmapName = + QStyleHelper::uniqueName("$qt_ia-"_L1 + % QLatin1StringView(metaObject()->className()), + opt, QSize(size, size)) + % HexString<uint>(pe); if (!QPixmapCache::find(pixmapName, &pixmap)) { qreal pixelRatio = p->device()->devicePixelRatio(); int border = qRound(pixelRatio*(size/5)); diff --git a/src/widgets/styles/qpixmapstyle.cpp b/src/widgets/styles/qpixmapstyle.cpp index ce574e459e..9370e289d6 100644 --- a/src/widgets/styles/qpixmapstyle.cpp +++ b/src/widgets/styles/qpixmapstyle.cpp @@ -1207,7 +1207,7 @@ QPixmap QPixmapStylePrivate::getCachedPixmap(QPixmapStyle::ControlDescriptor con const QString sizeString = QString::number(size.width()) % u'*' % QString::number(size.height()); - const QString key = QLatin1String(q->metaObject()->className()) % QString::number(control) + const QString key = QLatin1StringView(q->metaObject()->className()) % QString::number(control) % u'@' % sizeString; QPixmap result; diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index c7e77a2d56..32ac64265a 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -1051,7 +1051,7 @@ QRenderRule::QRenderRule(const QList<Declaration> &declarations, const QObject * } else if (decl.d->propertyId == UnknownProperty) { bool knownStyleHint = false; for (int i = 0; i < numKnownStyleHints; i++) { - QLatin1String styleHint(knownStyleHints[i]); + QLatin1StringView styleHint(knownStyleHints[i]); if (decl.d->property.compare(styleHint) == 0) { QString hintName = QString(styleHint); QVariant hintValue; @@ -1893,7 +1893,7 @@ QRenderRule QStyleSheetStyle::renderRule(const QObject *obj, int element, quint6 } - const QString part = QLatin1String(knownPseudoElements[element].name); + const QString part = QLatin1StringView(knownPseudoElements[element].name); QList<Declaration> decls = declarations(rules, part, state); QRenderRule newRule(decls, obj); cache[state] = newRule; @@ -2199,7 +2199,7 @@ bool QStyleSheetStyle::hasStyleRule(const QObject *obj, int part) const return result; } - QString pseudoElement = QLatin1String(knownPseudoElements[part].name); + QString pseudoElement = QLatin1StringView(knownPseudoElements[part].name); for (int i = 0; i < rules.count(); i++) { const Selector& selector = rules.at(i).selectors.at(0); if (pseudoElement.compare(selector.pseudoElement(), Qt::CaseInsensitive) == 0) { @@ -5501,7 +5501,7 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op /*! \internal */ -static QLatin1String propertyNameForStandardPixmap(QStyle::StandardPixmap sp) +static QLatin1StringView propertyNameForStandardPixmap(QStyle::StandardPixmap sp) { switch (sp) { case QStyle::SP_TitleBarMenuButton: return "titlebar-menu-icon"_L1; |