diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2018-07-06 07:23:19 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2018-07-09 12:17:44 +0000 |
| commit | 1a5d3a7300e5188e1406ed88871ba42a8200860c (patch) | |
| tree | 9bd74d6acf3ff4bf6ac80963de96f7a13e8fb196 /src/corelib/tools/qlocale.cpp | |
| parent | d13d7f87ae55f19781acbeec007cb5cc25c13040 (diff) | |
QLocale: Convert the ok checks to nullptr
And stick to one style in the same file.
Change-Id: I8a9a15425dadf4b480f63b68860de9276dbb787c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 3997652437..d2254f5884 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -1189,7 +1189,7 @@ T toIntegral_helper(const QLocalePrivate *d, QStringView str, bool *ok) // we select the right overload by the last, unused parameter Int64 val = toIntegral_helper(d->m_data, str, ok, d->m_numberOptions, Int64()); if (T(val) != val) { - if (ok) + if (ok != nullptr) *ok = false; val = 0; } @@ -3576,14 +3576,14 @@ double QLocaleData::stringToDouble(QStringView str, bool *ok, { CharBuff buff; if (!numberToCLocale(str, number_options, &buff)) { - if (ok != 0) + if (ok != nullptr) *ok = false; return 0.0; } int processed = 0; bool nonNullOk = false; double d = asciiToDouble(buff.constData(), buff.length() - 1, nonNullOk, processed); - if (ok) + if (ok != nullptr) *ok = nonNullOk; return d; } @@ -3593,7 +3593,7 @@ qlonglong QLocaleData::stringToLongLong(QStringView str, int base, bool *ok, { CharBuff buff; if (!numberToCLocale(str, number_options, &buff)) { - if (ok != 0) + if (ok != nullptr) *ok = false; return 0; } @@ -3606,7 +3606,7 @@ qulonglong QLocaleData::stringToUnsLongLong(QStringView str, int base, bool *ok, { CharBuff buff; if (!numberToCLocale(str, number_options, &buff)) { - if (ok != 0) + if (ok != nullptr) *ok = false; return 0; } @@ -3621,7 +3621,7 @@ double QLocaleData::bytearrayToDouble(const char *num, bool *ok) Q_ASSERT(len >= 0); int processed = 0; double d = asciiToDouble(num, len, nonNullOk, processed); - if (ok) + if (ok != nullptr) *ok = nonNullOk; return d; } @@ -3632,7 +3632,7 @@ qlonglong QLocaleData::bytearrayToLongLong(const char *num, int base, bool *ok) const char *endptr; if (*num == '\0') { - if (ok != 0) + if (ok != nullptr) *ok = false; return 0; } @@ -3640,7 +3640,7 @@ qlonglong QLocaleData::bytearrayToLongLong(const char *num, int base, bool *ok) qlonglong l = qstrtoll(num, &endptr, base, &_ok); if (!_ok) { - if (ok != 0) + if (ok != nullptr) *ok = false; return 0; } @@ -3652,12 +3652,12 @@ qlonglong QLocaleData::bytearrayToLongLong(const char *num, int base, bool *ok) if (*endptr != '\0') { // we stopped at a non-digit character after converting some digits - if (ok != 0) + if (ok != nullptr) *ok = false; return 0; } - if (ok != 0) + if (ok != nullptr) *ok = true; return l; } @@ -3669,7 +3669,7 @@ qulonglong QLocaleData::bytearrayToUnsLongLong(const char *num, int base, bool * qulonglong l = qstrtoull(num, &endptr, base, &_ok); if (!_ok) { - if (ok != 0) + if (ok != nullptr) *ok = false; return 0; } @@ -3685,7 +3685,7 @@ qulonglong QLocaleData::bytearrayToUnsLongLong(const char *num, int base, bool * return 0; } - if (ok != 0) + if (ok != nullptr) *ok = true; return l; } |