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

QStyleSheetStyle: use range-based for loops

Browse Source 
Replace some for loops with range-based ones.

Pick-to: 6.9
Change-Id: Ib11fb4ec5785b8ec4c9c297684f90d7f5031fe58
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit a0c591c1203bd749b550814bd57597c1b297b26e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2025-05-02 22:09:17 +02:00 committed by Qt Cherry-pick Bot
parent 92d73eb9d5
commit 9eb84657bc
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1004,8 +1004,7 @@ QRenderRule::QRenderRule(const QList<Declaration> &declarations, const QObject *
palette = QToolTip::palette(); palette = QToolTip::palette();
#endif #endif
for (int i = 0; i < declarations.size(); i++) { for (const Declaration &decl : declarations) {
const Declaration& decl = declarations.at(i);
if (decl.d->propertyId == BorderImage) { if (decl.d->propertyId == BorderImage) {
QString uri; QString uri;
QCss::TileMode horizStretch, vertStretch; QCss::TileMode horizStretch, vertStretch;
@ -1753,8 +1752,8 @@ static QList<Declaration> declarations(const QList<StyleRule> &styleRules, QLati
quint64 pseudoClass = PseudoClass_Unspecified) quint64 pseudoClass = PseudoClass_Unspecified)
{ {
QList<Declaration> decls; QList<Declaration> decls;
for (int i = 0; i < styleRules.size(); i++) { for (const auto &rule : styleRules) {
const Selector& selector = styleRules.at(i).selectors.at(0); const Selector &selector = rule.selectors.at(0);
// Rules with pseudo elements don't cascade. This is an intentional // Rules with pseudo elements don't cascade. This is an intentional
// diversion for CSS // diversion for CSS
if (part.compare(selector.pseudoElement(), Qt::CaseInsensitive) != 0) if (part.compare(selector.pseudoElement(), Qt::CaseInsensitive) != 0)
@ -1763,7 +1762,7 @@ static QList<Declaration> declarations(const QList<StyleRule> &styleRules, QLati
quint64 cssClass = selector.pseudoClass(&negated); quint64 cssClass = selector.pseudoClass(&negated);
if ((pseudoClass == PseudoClass_Any) || (cssClass == PseudoClass_Unspecified) if ((pseudoClass == PseudoClass_Any) || (cssClass == PseudoClass_Unspecified)
|| ((((cssClass & pseudoClass) == cssClass)) && ((negated & pseudoClass) == 0))) || ((((cssClass & pseudoClass) == cssClass)) && ((negated & pseudoClass) == 0)))
decls += styleRules.at(i).declarations; decls += rule.declarations;
} }
return decls; return decls;
} }
@ -1883,8 +1882,8 @@ QRenderRule QStyleSheetStyle::renderRule(const QObject *obj, int element, quint6
quint64 stateMask = 0; quint64 stateMask = 0;
const QList<StyleRule> rules = styleRules(obj); const QList<StyleRule> rules = styleRules(obj);
for (int i = 0; i < rules.size(); i++) { for (const auto &rule : rules) {
const Selector& selector = rules.at(i).selectors.at(0); const Selector &selector = rule.selectors.at(0);
quint64 negated = 0; quint64 negated = 0;
stateMask |= selector.pseudoClass(&negated); stateMask |= selector.pseudoClass(&negated);
stateMask |= negated; stateMask |= negated;
@ -2205,8 +2204,8 @@ bool QStyleSheetStyle::hasStyleRule(const QObject *obj, int part) const
} }
const auto pseudoElement = QLatin1StringView(knownPseudoElements[part].name); const auto pseudoElement = QLatin1StringView(knownPseudoElements[part].name);
for (int i = 0; i < rules.size(); i++) { for (const auto &rule : rules) {
const Selector& selector = rules.at(i).selectors.at(0); const Selector &selector = rule.selectors.at(0);
if (pseudoElement.compare(selector.pseudoElement(), Qt::CaseInsensitive) == 0) { if (pseudoElement.compare(selector.pseudoElement(), Qt::CaseInsensitive) == 0) {
cache[part] = true; cache[part] = true;
return true; return true;
@ -2939,9 +2938,9 @@ void QStyleSheetStyle::polish(QWidget *w)
setPalette(w); setPalette(w);
//set the WA_Hover attribute if one of the selector depends of the hover state //set the WA_Hover attribute if one of the selector depends of the hover state
QList<StyleRule> rules = styleRules(w); const QList<StyleRule> rules = styleRules(w);
for (int i = 0; i < rules.size(); i++) { for (const auto &rule : rules) {
const Selector& selector = rules.at(i).selectors.at(0); const Selector &selector = rule.selectors.at(0);
quint64 negated = 0; quint64 negated = 0;
quint64 cssClass = selector.pseudoClass(&negated); quint64 cssClass = selector.pseudoClass(&negated);
if ( cssClass & PseudoClass_Hover || negated & PseudoClass_Hover) { if ( cssClass & PseudoClass_Hover || negated & PseudoClass_Hover) {