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

Port from qlocale_data_p.h's isZero() to qIsNull()

Browse Source 
... and mark the former for removal in 6.12 (LTS+1).

I couldn't find more in-tree users than the ones this patch ports, but
it doesn't cost much to defer removal of the function, so do it.

Change-Id: I8a8762e65907d3f66c20cd733ecb55f7ac876960
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2024-09-17 15:26:57 +02:00
parent 743403cb6d
commit c85d896257
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/text/qlocale.cpp
View File

@ -3827,7 +3827,7 @@ QString QLocaleData::doubleToString(double d, int precision, DoubleForm form,
bool negative = false; bool negative = false;
qt_doubleToAscii(d, form, precision, buf.data(), bufSize, negative, length, decpt); qt_doubleToAscii(d, form, precision, buf.data(), bufSize, negative, length, decpt);
const QString prefix = signPrefix(negative && !isZero(d), flags); const QString prefix = signPrefix(negative && !qIsNull(d), flags);
QString numStr; QString numStr;
if (length == 3 if (length == 3

6
src/corelib/text/qlocale_tools.cpp
View File

@ -117,7 +117,7 @@ void qt_doubleToAscii(double d, QLocaleData::DoubleForm form, int precision,
else if (precision == QLocale::FloatingPointShortest) else if (precision == QLocale::FloatingPointShortest)
precision = std::numeric_limits<double>::max_digits10; // snprintf lacks "shortest" mode precision = std::numeric_limits<double>::max_digits10; // snprintf lacks "shortest" mode
if (isZero(d)) { if (qIsNull(d)) {
// Negative zero is expected as simple "0", not "-0". We cannot do d < 0, though. // Negative zero is expected as simple "0", not "-0". We cannot do d < 0, though.
sign = false; sign = false;
buf[0] = '0'; buf[0] = '0';
@ -356,7 +356,7 @@ QSimpleParsedNumber<double> qt_asciiToDouble(const char *num, qsizetype numLen,
Q_ASSERT(strayCharMode == TrailingJunkAllowed || processed == numLen); Q_ASSERT(strayCharMode == TrailingJunkAllowed || processed == numLen);
// Check if underflow has occurred. // Check if underflow has occurred.
if (isZero(d)) { if (qIsNull(d)) {
for (int i = 0; i < processed; ++i) { for (int i = 0; i < processed; ++i) {
if (num[i] >= '1' && num[i] <= '9') { if (num[i] >= '1' && num[i] <= '9') {
// if a digit before any 'e' is not 0, then a non-zero number was intended. // if a digit before any 'e' is not 0, then a non-zero number was intended.
@ -721,7 +721,7 @@ static T dtoString(double d, QLocaleData::DoubleForm form, int precision, bool u
T result; T result;
result.reserve(total); result.reserve(total);
if (negative && !isZero(d)) // We don't return "-0" if (negative && !qIsNull(d)) // We don't return "-0"
result.append(Char('-')); result.append(Char('-'));
if (!qt_is_finite(d)) { if (!qt_is_finite(d)) {
result.append(view); result.append(view);

3
src/corelib/text/qlocale_tools_p.h
View File

@ -63,10 +63,13 @@ void qt_doubleToAscii(double d, QLocaleData::DoubleForm form, int precision,
int base = 10); int base = 10);
#endif #endif
#if QT_VERSION < QT_VERSION_CHECK(6, 12, 0)
[[deprecated("Use qIsNull(double) instead.")]]
[[nodiscard]] constexpr inline bool isZero(double d) [[nodiscard]] constexpr inline bool isZero(double d)
{ {
return qIsNull(d); return qIsNull(d);
} }
#endif
// Enough space for the digits before the decimal separator: // Enough space for the digits before the decimal separator:
[[nodiscard]] inline int wholePartSpace(double d) [[nodiscard]] inline int wholePartSpace(double d)