whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QString: skip QLocale::numberToCLocale for floating point 

This is a repeat of commit 885ae61c63,
which applied a direct QString-to-Latin1 conversion to integral parsing
to avoid going through the expensive QLocale::numberToCLocale. But we
also need to lowercase the input.

Change-Id: Ieba79baf5ac34264a988fffd1726762a411e3bd6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Thiago Macieira 2022-11-10 23:10:35 -08:00
parent 308f9ae8f0
commit cc98a7d01f
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/corelib/text/qstring.cpp
View File

@ -7487,7 +7487,22 @@ double QString::toDouble(bool *ok) const
double QStringView::toDouble(bool *ok) const
{
return QLocaleData::c()->stringToDouble(*this, ok, QLocale::RejectGroupSeparator);
QStringView string = qt_trimmed(*this);
QVarLengthArray<uchar> latin1(string.size());
qt_to_latin1(latin1.data(), string.utf16(), string.size());
// We need lowetcased "inf" and "nan".
// This mangles the string, but nothing can become a number or letter
// that isn't already a number or letter.
for (uchar &c : latin1) {
if (c >= 'A')
c |= 0x20;
}
auto r = qt_asciiToDouble(reinterpret_cast<const char *>(latin1.data()), string.size());
if (ok != nullptr)
*ok = r.ok();
return r.result;
}
/*!