diff --git a/src/core/tools/qlocale.cpp b/src/core/tools/qlocale.cpp index 833e961e2..2f785ff0a 100644 --- a/src/core/tools/qlocale.cpp +++ b/src/core/tools/qlocale.cpp @@ -1904,7 +1904,7 @@ QString QLocalePrivate::doubleToString(const QChar _zero, const QChar plus, cons // NOT thread safe! if (form == DFDecimal) { QSTACKARRAY(char, qfcvtbuf, QECVT_BUFFSIZE); - digits = QString::fromLatin1(qfcvt(d, precision, &decpt, &sign, qfcvtbuf)); + digits = QString::fromLatin1(qFcvt(d, precision, &decpt, &sign, qfcvtbuf)); } else { int pr = precision; if (form == DFExponent) @@ -1912,7 +1912,7 @@ QString QLocalePrivate::doubleToString(const QChar _zero, const QChar plus, cons else if (form == DFSignificantDigits && pr == 0) pr = 1; QSTACKARRAY(char, qecvtbuf, QECVT_BUFFSIZE); - digits = QString::fromLatin1(qecvt(d, pr, &decpt, &sign, qecvtbuf)); + digits = QString::fromLatin1(qEcvt(d, pr, &decpt, &sign, qecvtbuf)); // Chop trailing zeros if (digits.length() > 0) { diff --git a/src/core/tools/qlocale_tools.cpp b/src/core/tools/qlocale_tools.cpp index 00a31f807..10570a52f 100644 --- a/src/core/tools/qlocale_tools.cpp +++ b/src/core/tools/qlocale_tools.cpp @@ -323,7 +323,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ // the code bellow is copy from musl libc, modified to not use static buffer // and use snprintf() instead of sprintf() -char *qfcvt(double x, int n, int *dp, int *sign, char* buf) +char *qFcvt(double x, int n, int *dp, int *sign, char* buf) { QSTACKARRAY(char, tmp, 1500); int i, lz; @@ -341,10 +341,10 @@ char *qfcvt(double x, int n, int *dp, int *sign, char* buf) return (char*)"000000000000000"+14-n; } - return qecvt(x, n-lz, dp, sign, buf); + return qEcvt(x, n-lz, dp, sign, buf); } -char *qecvt(double x, int n, int *dp, int *sign, char* buf) +char *qEcvt(double x, int n, int *dp, int *sign, char* buf) { QSTACKARRAY(char, tmp, 32); int i, j; diff --git a/src/core/tools/qlocale_tools_p.h b/src/core/tools/qlocale_tools_p.h index e2c09259b..f5d1fa745 100644 --- a/src/core/tools/qlocale_tools_p.h +++ b/src/core/tools/qlocale_tools_p.h @@ -101,8 +101,8 @@ bool qt_u_strToUpper(const QString &str, QString *out, const QLocale &locale); bool qt_u_strToLower(const QString &str, QString *out, const QLocale &locale); #define QECVT_BUFFSIZE 17 -char *qfcvt(double x, int n, int *dp, int *sign, char* buf); -char *qecvt(double x, int n, int *dp, int *sign, char* buf); +char *qFcvt(double x, int n, int *dp, int *sign, char* buf); +char *qEcvt(double x, int n, int *dp, int *sign, char* buf); QT_END_NAMESPACE