summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qlocale.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2018-07-31 11:47:01 -0700
committerThiago Macieira <thiago.macieira@intel.com>2018-08-03 20:26:48 +0000
commit95c0b24cd824321e59ae31d5bd78bae62566499b (patch)
tree29d2cd89b2448908cf42171b06244605720cdf2a /src/corelib/tools/qlocale.cpp
parent6c8160b0dcadf7afd8eb0bd22536d6d0331dcbfa (diff)
Add "qt_" prefix to asciiToDouble and doubleToAscii functions
Change-Id: Ie01831ddac5446fdbdeefffd154688839acbe838 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
-rw-r--r--src/corelib/tools/qlocale.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 36e2dd52bf..7341d196cb 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -3077,7 +3077,7 @@ QString QLocaleData::doubleToString(const QChar _zero, const QChar plus, const Q
QVarLengthArray<char> buf(bufSize);
int length;
- doubleToAscii(d, form, precision, buf.data(), bufSize, negative, length, decpt);
+ qt_doubleToAscii(d, form, precision, buf.data(), bufSize, negative, length, decpt);
if (qstrncmp(buf.data(), "inf", 3) == 0 || qstrncmp(buf.data(), "nan", 3) == 0) {
num_str = QString::fromLatin1(buf.data(), length);
@@ -3587,7 +3587,7 @@ double QLocaleData::stringToDouble(QStringView str, bool *ok,
}
int processed = 0;
bool nonNullOk = false;
- double d = asciiToDouble(buff.constData(), buff.length() - 1, nonNullOk, processed);
+ double d = qt_asciiToDouble(buff.constData(), buff.length() - 1, nonNullOk, processed);
if (ok != nullptr)
*ok = nonNullOk;
return d;
@@ -3625,7 +3625,7 @@ double QLocaleData::bytearrayToDouble(const char *num, bool *ok)
int len = static_cast<int>(strlen(num));
Q_ASSERT(len >= 0);
int processed = 0;
- double d = asciiToDouble(num, len, nonNullOk, processed);
+ double d = qt_asciiToDouble(num, len, nonNullOk, processed);
if (ok != nullptr)
*ok = nonNullOk;
return d;