From f8976a3e31ec07e191cd5bf27b64b030e3675748 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 7 Jul 2022 14:52:28 +0200 Subject: Port qt_getJustfication* functions to qsizetype They're self-contained; callers passing ints will not cause warnings. Pick-to: 6.4 Task-number: QTBUG-104820 Change-Id: I1dcc1b178b7d72d23dd0596835ab2868c0c6f8c1 Reviewed-by: Sona Kurazyan --- src/gui/text/qtextengine.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui') diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 88c6760e01..c6da4b8f4a 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1211,9 +1211,9 @@ enum JustificationClass { Adds an inter character justification opportunity after the number or letter character and a space justification opportunity after the space character. */ -static inline void qt_getDefaultJustificationOpportunities(const ushort *string, int length, const QGlyphLayout &g, ushort *log_clusters, int spaceAs) +static inline void qt_getDefaultJustificationOpportunities(const ushort *string, qsizetype length, const QGlyphLayout &g, ushort *log_clusters, int spaceAs) { - int str_pos = 0; + qsizetype str_pos = 0; while (str_pos < length) { int glyph_pos = log_clusters[str_pos]; @@ -1245,7 +1245,7 @@ static inline void qt_getDefaultJustificationOpportunities(const ushort *string, } } -static inline void qt_getJustificationOpportunities(const ushort *string, int length, const QScriptItem &si, const QGlyphLayout &g, ushort *log_clusters) +static inline void qt_getJustificationOpportunities(const ushort *string, qsizetype length, const QScriptItem &si, const QGlyphLayout &g, ushort *log_clusters) { Q_ASSERT(length > 0 && g.numGlyphs > 0); -- cgit v1.2.3