diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-04-06 22:47:32 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-04-06 22:47:32 (GMT) |
| commit | bccb7b178c0255c74d648c3972895f66a70fd87b (patch) | |
| tree | ead94cee89e2ffda4127201b734f1660f1389585 /src/corelib/tools/qlocale.cpp | |
| parent | 423d6052844b2026c8acc8826d6546d3afc494d3 (diff) | |
| parent | cf42b485ebc1ab3e1f0a804b8c4e404fa99f1f6f (diff) | |
| download | Qt-bccb7b178c0255c74d648c3972895f66a70fd87b.zip Qt-bccb7b178c0255c74d648c3972895f66a70fd87b.tar.gz Qt-bccb7b178c0255c74d648c3972895f66a70fd87b.tar.bz2 | |
Merge branch 'master' into contiguouscache
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index db2fc26..559ba81 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -4399,7 +4399,8 @@ double QLocalePrivate::stringToDouble(const QString &number, bool *ok, GroupSeparatorMode group_sep_mode) const { CharBuff buff; - if (!numberToCLocale(number, group_sep_mode, &buff)) { + if (!numberToCLocale(group().unicode() == 0xa0 ? number.trimmed() : number, + group_sep_mode, &buff)) { if (ok != 0) *ok = false; return 0.0; @@ -4411,7 +4412,8 @@ qlonglong QLocalePrivate::stringToLongLong(const QString &number, int base, bool *ok, GroupSeparatorMode group_sep_mode) const { CharBuff buff; - if (!numberToCLocale(number, group_sep_mode, &buff)) { + if (!numberToCLocale(group().unicode() == 0xa0 ? number.trimmed() : number, + group_sep_mode, &buff)) { if (ok != 0) *ok = false; return 0; @@ -4424,7 +4426,8 @@ qulonglong QLocalePrivate::stringToUnsLongLong(const QString &number, int base, bool *ok, GroupSeparatorMode group_sep_mode) const { CharBuff buff; - if (!numberToCLocale(number, group_sep_mode, &buff)) { + if (!numberToCLocale(group().unicode() == 0xa0 ? number.trimmed() : number, + group_sep_mode, &buff)) { if (ok != 0) *ok = false; return 0; |