diff options
author | Jari Karppinen <jari.karppinen@qt.io> | 2019-05-21 10:08:08 +0300 |
---|---|---|
committer | Jari Karppinen <jari.karppinen@qt.io> | 2019-05-21 11:38:19 +0300 |
commit | 36596f65fd4631e7dd89fde816e450ae26c5bcc9 (patch) | |
tree | 506e1ee329adcba399cb22ade2ea42f1884e6eba | |
parent | 6e6fc518adf0d4da2d5bbe0deaa558c192c85a15 (diff) |
Replace strtod with locale-independent float parsing
Task-number: QT3DS-3317
Change-Id: I8998ff2ef61d0efdf4cffcbf71cf825308830617
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
-rw-r--r-- | src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h index 9268e6dc..eec2cf3b 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h @@ -187,8 +187,10 @@ struct WStrOps<QT3DSF32> } bool StrTo(const char8_t *buffer, QT3DSF32 &item) { - item = (QT3DSF32)strtod(buffer, NULL); - return true; + static QLocale c(QLocale::C); + bool ok; + item = c.toFloat(buffer, &ok); + return ok; } }; @@ -201,8 +203,10 @@ struct WStrOps<QT3DSF64> } bool StrTo(const char8_t *buffer, QT3DSF64 &item) { - item = strtod(buffer, NULL); - return true; + static QLocale c(QLocale::C); + bool ok; + item = c.toDouble(buffer, &ok); + return ok; } }; #define QT3DS_WCHAR_T_None L"None" |