summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qbytearray.cpp
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2018-06-16 22:20:29 +0200
committerAndré Hartmann <aha_1980@gmx.de>2018-06-22 10:59:31 +0000
commit95b41777bb013e0841044a617706fab452e297cd (patch)
tree3fe65c09360db6e064ba540db24e611f77cfe9ae /src/corelib/tools/qbytearray.cpp
parentd640dbf730b392640d5497a789e95fa7d88f99fb (diff)
QLocale/QString/QByteArray: Use nullptr in documentation
While at it, fix some more issues in the sentences to harmonize the description between the different classes. Change-Id: Iee1c3ffe6fd71e82504bfb003d927c4db3b2a065 Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/corelib/tools/qbytearray.cpp')
-rw-r--r--src/corelib/tools/qbytearray.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index 7c601e1336..424420204a 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -3671,8 +3671,8 @@ T toIntegral_helper(const char *data, bool *ok, int base)
Returns 0 if the conversion fails.
- If \a ok is not 0: if a conversion error occurs, *\a{ok} is set to
- false; otherwise *\a{ok} is set to true.
+ If \a ok is not \c nullptr, failure is reported by setting *\a{ok}
+ to \c false, and success by setting *\a{ok} to \c true.
\note The conversion of the number is performed in the default C locale,
irrespective of the user's locale.
@@ -3697,8 +3697,8 @@ qlonglong QByteArray::toLongLong(bool *ok, int base) const
Returns 0 if the conversion fails.
- If \a ok is not 0: if a conversion error occurs, *\a{ok} is set to
- false; otherwise *\a{ok} is set to true.
+ If \a ok is not \c nullptr, failure is reported by setting *\a{ok}
+ to \c false, and success by setting *\a{ok} to \c true.
\note The conversion of the number is performed in the default C locale,
irrespective of the user's locale.
@@ -3722,8 +3722,8 @@ qulonglong QByteArray::toULongLong(bool *ok, int base) const
Returns 0 if the conversion fails.
- If \a ok is not 0: if a conversion error occurs, *\a{ok} is set to
- false; otherwise *\a{ok} is set to true.
+ If \a ok is not \c nullptr, failure is reported by setting *\a{ok}
+ to \c false, and success by setting *\a{ok} to \c true.
\snippet code/src_corelib_tools_qbytearray.cpp 36
@@ -3749,8 +3749,8 @@ int QByteArray::toInt(bool *ok, int base) const
Returns 0 if the conversion fails.
- If \a ok is not 0: if a conversion error occurs, *\a{ok} is set to
- false; otherwise *\a{ok} is set to true.
+ If \a ok is not \c nullptr, failure is reported by setting *\a{ok}
+ to \c false, and success by setting *\a{ok} to \c true.
\note The conversion of the number is performed in the default C locale,
irrespective of the user's locale.
@@ -3776,8 +3776,8 @@ uint QByteArray::toUInt(bool *ok, int base) const
Returns 0 if the conversion fails.
- If \a ok is not 0: if a conversion error occurs, *\a{ok} is set to
- false; otherwise *\a{ok} is set to true.
+ If \a ok is not \c nullptr, failure is reported by setting *\a{ok}
+ to \c false, and success by setting *\a{ok} to \c true.
\snippet code/src_corelib_tools_qbytearray.cpp 37
@@ -3804,8 +3804,8 @@ long QByteArray::toLong(bool *ok, int base) const
Returns 0 if the conversion fails.
- If \a ok is not 0: if a conversion error occurs, *\a{ok} is set to
- false; otherwise *\a{ok} is set to true.
+ If \a ok is not \c nullptr, failure is reported by setting *\a{ok}
+ to \c false, and success by setting *\a{ok} to \c true.
\note The conversion of the number is performed in the default C locale,
irrespective of the user's locale.
@@ -3828,8 +3828,8 @@ ulong QByteArray::toULong(bool *ok, int base) const
Returns 0 if the conversion fails.
- If \a ok is not 0: if a conversion error occurs, *\a{ok} is set to
- false; otherwise *\a{ok} is set to true.
+ If \a ok is not \c nullptr, failure is reported by setting *\a{ok}
+ to \c false, and success by setting *\a{ok} to \c true.
\note The conversion of the number is performed in the default C locale,
irrespective of the user's locale.
@@ -3853,8 +3853,8 @@ short QByteArray::toShort(bool *ok, int base) const
Returns 0 if the conversion fails.
- If \a ok is not 0: if a conversion error occurs, *\a{ok} is set to
- false; otherwise *\a{ok} is set to true.
+ If \a ok is not \c nullptr, failure is reported by setting *\a{ok}
+ to \c false, and success by setting *\a{ok} to \c true.
\note The conversion of the number is performed in the default C locale,
irrespective of the user's locale.
@@ -3873,8 +3873,8 @@ ushort QByteArray::toUShort(bool *ok, int base) const
Returns 0.0 if the conversion fails.
- If \a ok is not 0: if a conversion error occurs, *\a{ok} is set to
- false; otherwise *\a{ok} is set to true.
+ If \a ok is not \c nullptr, failure is reported by setting *\a{ok}
+ to \c false, and success by setting *\a{ok} to \c true.
\snippet code/src_corelib_tools_qbytearray.cpp 38
@@ -3900,8 +3900,8 @@ double QByteArray::toDouble(bool *ok) const
Returns 0.0 if the conversion fails.
- If \a ok is not 0: if a conversion error occurs, *\a{ok} is set to
- false; otherwise *\a{ok} is set to true.
+ If \a ok is not \c nullptr, failure is reported by setting *\a{ok}
+ to \c false, and success by setting *\a{ok} to \c true.
\note The conversion of the number is performed in the default C locale,
irrespective of the user's locale.