Fix QString::toHtmlEscaped() for >2Gi character strings
More unfinished int → qsizetype porting. Fixes: QTBUG-105104 Change-Id: I3470de31c476b3d7736661550916828e43546573 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit c1991c63fc081a42ed3e6a28f82f395c54ef42a1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
1fa58a3d8b
commit
a974968d61
@ -10896,19 +10896,19 @@ qsizetype QtPrivate::count(QStringView haystack, const QRegularExpression &re)
|
|||||||
QString QString::toHtmlEscaped() const
|
QString QString::toHtmlEscaped() const
|
||||||
{
|
{
|
||||||
QString rich;
|
QString rich;
|
||||||
const int len = length();
|
const qsizetype len = length();
|
||||||
rich.reserve(qsizetype(len * 1.1));
|
rich.reserve(qsizetype(len * 1.1));
|
||||||
for (int i = 0; i < len; ++i) {
|
for (QChar ch : *this) {
|
||||||
if (at(i) == u'<')
|
if (ch == u'<')
|
||||||
rich += "<"_L1;
|
rich += "<"_L1;
|
||||||
else if (at(i) == u'>')
|
else if (ch == u'>')
|
||||||
rich += ">"_L1;
|
rich += ">"_L1;
|
||||||
else if (at(i) == u'&')
|
else if (ch == u'&')
|
||||||
rich += "&"_L1;
|
rich += "&"_L1;
|
||||||
else if (at(i) == u'"')
|
else if (ch == u'"')
|
||||||
rich += """_L1;
|
rich += """_L1;
|
||||||
else
|
else
|
||||||
rich += at(i);
|
rich += ch;
|
||||||
}
|
}
|
||||||
rich.squeeze();
|
rich.squeeze();
|
||||||
return rich;
|
return rich;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user