diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-26 15:13:32 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-26 20:10:48 +0100 |
| commit | 5cb150be46f92dd9a1d3cca4ae67cfefd7967bda (patch) | |
| tree | 29fdc7a86fba17acba04b1ecaa2eb550e177311a /src/corelib/text/qstring.cpp | |
| parent | bcc7d3454063520ec2a8d3c7a579a696ae2cc069 (diff) | |
Make remaining String binary comparisons hidden friends
Also forced the introduction of explicit comparisons with
char16_t* and std::nullptr_t.
Change-Id: I8e32c14a1d3aeec234ee070b9fefc6af06db0fda
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/text/qstring.cpp')
| -rw-r--r-- | src/corelib/text/qstring.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index d6c115397c..26d0a7acc8 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -5773,10 +5773,9 @@ QString& QString::fill(QChar ch, qsizetype size) */ /*! - \fn bool operator==(const char *s1, const QString &s2) + \fn bool QString::operator==(const char *s1, const QString &s2) - \overload operator==() - \relates QString + \overload operator==() Returns \c true if \a s1 is equal to \a s2; otherwise returns \c false. Note that no string is equal to \a s1 being 0. @@ -5785,8 +5784,7 @@ QString& QString::fill(QChar ch, qsizetype size) */ /*! - \fn bool operator!=(const char *s1, const QString &s2) - \relates QString + \fn bool QString::operator!=(const char *s1, const QString &s2) Returns \c true if \a s1 is not equal to \a s2; otherwise returns \c false. @@ -5796,8 +5794,7 @@ QString& QString::fill(QChar ch, qsizetype size) */ /*! - \fn bool operator<(const char *s1, const QString &s2) - \relates QString + \fn bool QString::operator<(const char *s1, const QString &s2) Returns \c true if \a s1 is lexically less than \a s2; otherwise returns \c false. For \a s1 != 0, this is equivalent to \c @@ -5807,8 +5804,7 @@ QString& QString::fill(QChar ch, qsizetype size) */ /*! - \fn bool operator<=(const char *s1, const QString &s2) - \relates QString + \fn bool QString::operator<=(const char *s1, const QString &s2) Returns \c true if \a s1 is lexically less than or equal to \a s2; otherwise returns \c false. For \a s1 != 0, this is equivalent to \c @@ -5818,8 +5814,7 @@ QString& QString::fill(QChar ch, qsizetype size) */ /*! - \fn bool operator>(const char *s1, const QString &s2) - \relates QString + \fn bool QString::operator>(const char *s1, const QString &s2) Returns \c true if \a s1 is lexically greater than \a s2; otherwise returns \c false. Equivalent to \c {compare(s1, s2) > 0}. @@ -5828,8 +5823,7 @@ QString& QString::fill(QChar ch, qsizetype size) */ /*! - \fn bool operator>=(const char *s1, const QString &s2) - \relates QString + \fn bool QString::operator>=(const char *s1, const QString &s2) Returns \c true if \a s1 is lexically greater than or equal to \a s2; otherwise returns \c false. For \a s1 != 0, this is equivalent to \c |