1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QStyleSheetStyle: avoid creating QString

Browse Source 
Don't create a QString when comparing the strings from
knownPseudoElements - a QLatin1StringView is enough.

Change-Id: I69e207bac0fb3d3df12ae9d4bebc9cd30cde30de
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 15c2ec5344fb8a1e5d4a8e93d410c54563fb86b4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit fe777849c95ca66bdfe29e65016669e349909e49)
This commit is contained in:
Christian Ehrlicher 2025-05-02 22:07:37 +02:00 committed by Qt Cherry-pick Bot
parent 9d3390eb5d
commit 96f9151e4a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -247,7 +247,7 @@ struct PseudoElementInfo {
const char name[19]; const char name[19];
}; };
static const PseudoElementInfo knownPseudoElements[NumPseudoElements] = { static constexpr PseudoElementInfo knownPseudoElements[NumPseudoElements] = {
{ QStyle::SC_None, "" }, { QStyle::SC_None, "" },
{ QStyle::SC_None, "down-arrow" }, { QStyle::SC_None, "down-arrow" },
{ QStyle::SC_None, "up-arrow" }, { QStyle::SC_None, "up-arrow" },
@ -300,7 +300,7 @@ static const PseudoElementInfo knownPseudoElements[NumPseudoElements] = {
{ QStyle::SC_SliderGroove, "groove" }, { QStyle::SC_SliderGroove, "groove" },
{ QStyle::SC_SliderHandle, "handle" }, { QStyle::SC_SliderHandle, "handle" },
{ QStyle::SC_None, "add-page" }, { QStyle::SC_None, "add-page" },
{ QStyle::SC_None, "sub-page"}, { QStyle::SC_None, "sub-page" },
{ QStyle::SC_SliderTickmarks, "tick-mark" }, { QStyle::SC_SliderTickmarks, "tick-mark" },
{ QStyle::SC_None, "pane" }, { QStyle::SC_None, "pane" },
{ QStyle::SC_None, "tab-bar" }, { QStyle::SC_None, "tab-bar" },
@ -1749,7 +1749,7 @@ QList<QCss::StyleRule> QStyleSheetStyle::styleRules(const QObject *obj) const
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
// Rendering rules // Rendering rules
static QList<Declaration> declarations(const QList<StyleRule> &styleRules, const QString &part, static QList<Declaration> declarations(const QList<StyleRule> &styleRules, QLatin1StringView part,
quint64 pseudoClass = PseudoClass_Unspecified) quint64 pseudoClass = PseudoClass_Unspecified)
{ {
QList<Declaration> decls; QList<Declaration> decls;
@ -1898,7 +1898,7 @@ QRenderRule QStyleSheetStyle::renderRule(const QObject *obj, int element, quint6
} }
const QString part = QLatin1StringView(knownPseudoElements[element].name); const auto part = QLatin1StringView(knownPseudoElements[element].name);
QList<Declaration> decls = declarations(rules, part, state); QList<Declaration> decls = declarations(rules, part, state);
QRenderRule newRule(decls, obj); QRenderRule newRule(decls, obj);
cache[state] = newRule; cache[state] = newRule;
@ -2204,7 +2204,7 @@ bool QStyleSheetStyle::hasStyleRule(const QObject *obj, int part) const
return result; return result;
} }
auto pseudoElement = QLatin1StringView(knownPseudoElements[part].name); const auto pseudoElement = QLatin1StringView(knownPseudoElements[part].name);
for (int i = 0; i < rules.size(); i++) { for (int i = 0; i < rules.size(); i++) {
const Selector& selector = rules.at(i).selectors.at(0); const Selector& selector = rules.at(i).selectors.at(0);
if (pseudoElement.compare(selector.pseudoElement(), Qt::CaseInsensitive) == 0) { if (pseudoElement.compare(selector.pseudoElement(), Qt::CaseInsensitive) == 0) {
@ -2671,7 +2671,7 @@ void QStyleSheetStyle::setProperties(QWidget *w)
// Set value for each property in the order of property final occurrence // Set value for each property in the order of property final occurrence
// since properties interact. // since properties interact.
const QList<Declaration> decls = declarations(styleRules(w), QString()); const QList<Declaration> decls = declarations(styleRules(w), {});
QList<int> finals; // indices in reverse order of each property's final occurrence QList<int> finals; // indices in reverse order of each property's final occurrence
{ {