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

Port qt_getJustfication* functions to qsizetype

Browse Source 
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 <sona.kurazyan@qt.io>
This commit is contained in:
Marc Mutz 2022-07-07 14:52:28 +02:00
parent cb9715557c
commit f8976a3e31
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/text/qtextengine.cpp
View File

@ -1211,9 +1211,9 @@ enum JustificationClass {
Adds an inter character justification opportunity after the number or letter Adds an inter character justification opportunity after the number or letter
character and a space justification opportunity after the space character. 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) { while (str_pos < length) {
int glyph_pos = log_clusters[str_pos]; 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); Q_ASSERT(length > 0 && g.numGlyphs > 0);