From 859f2ca1a6eeddafd0d346a5716f84a9df1acbdc Mon Sep 17 00:00:00 2001 From: Oliver Eftevaag Date: Fri, 8 Oct 2021 16:45:02 +0200 Subject: [PATCH] Add const to read only local variables Pick-to: 6.2 Change-Id: Ideb34a5009277b919a8a3834e53af4ff550dfc6e Reviewed-by: Mitch Curtis --- src/gui/text/qfontdatabase.cpp | 4 ++-- src/gui/text/qtextlayout.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index e35e647f8b..8f98d9defc 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -1579,12 +1579,12 @@ bool QFontDatabase::isSmoothlyScalable(const QString &family, const QString &sty } if (!f) return smoothScalable; - QtFontStyle::Key styleKey(style); + const QtFontStyle::Key styleKey(style); for (int j = 0; j < f->count; j++) { QtFontFoundry *foundry = f->foundries[j]; if (foundryName.isEmpty() || foundry->name.compare(foundryName, Qt::CaseInsensitive) == 0) { for (int k = 0; k < foundry->count; k++) { - QtFontStyle *fontStyle = foundry->styles[k]; + const QtFontStyle *fontStyle = foundry->styles[k]; smoothScalable = fontStyle->smoothScalable && ((style.isEmpty() diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index e40f0c5fa0..03eaa9c726 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -1957,7 +1957,7 @@ void QTextLine::layout_helper(int maxGlyphs) // spaces to behave as in previous Qt versions in the line breaking algorithm. // The line breaks do not currently follow the Unicode specs, but fixing this would // require refactoring the code and would cause behavioral regressions. - bool isBreakableSpace = lbh.currentPosition < eng->layoutData->string.length() + const bool isBreakableSpace = lbh.currentPosition < eng->layoutData->string.length() && attributes[lbh.currentPosition].whiteSpace && eng->layoutData->string.at(lbh.currentPosition).decompositionTag() != QChar::NoBreak;