diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2018-06-17 20:09:39 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2018-07-07 19:58:18 +0000 |
| commit | f98ee77cd3e9964b995d063345a895e537bc1157 (patch) | |
| tree | 25b4f05d5bf44a6a74ca2b7092d50df44c55e1f9 /src/corelib/tools/qbytearray.cpp | |
| parent | 85472b6b02b42ea624e1c00a5fd38c0d2889a731 (diff) | |
QByteArray: toInt() and toDouble() ignore surrounding whitespaces
[ChangeLog][QtCore][QByteArray] QByteArray::toInt(),
QByteArray::toDouble() and the other number conversion functions
now ignore leading and trailing whitespaces, as their QString
counterparts already did. For consistency reasons, the same
behavior was added to qEnvironmentVariableIntValue() also.
Task-number: QTBUG-66187
Change-Id: I8b5e478ea8577b811d969286ea9e269f539c1ea4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/tools/qbytearray.cpp')
| -rw-r--r-- | src/corelib/tools/qbytearray.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index d8d8be7a26..3a24176dc2 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -4135,7 +4135,8 @@ double QByteArray::toDouble(bool *ok) const QByteArray nulled = nulTerminated(); bool nonNullOk = false; int processed = 0; - double d = asciiToDouble(nulled.constData(), nulled.length(), nonNullOk, processed); + double d = asciiToDouble(nulled.constData(), nulled.length(), + nonNullOk, processed, WhitespacesAllowed); if (ok) *ok = nonNullOk; return d; |