diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-04-06 13:57:19 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-06-08 21:42:33 +0000 |
commit | a7ae92e67dd15b0dde25c8bca2b1e16c983896bf (patch) | |
tree | 6acd55cea77520d9a4cbeef435aa1d16cbf359bc /src/corelib/tools/qstring.cpp | |
parent | f0d9eed0649f96e2ea1d289e66d7e1a661a2d982 (diff) |
QStringRef: add missing relational operators against QByteArray
QStringRef op QByteArray was ambiguous between
bool QStringRef::operator op(const char*) const
bool operator op(const QStringRef&, const QString&)
QByteArray op QStringRef was ambiguous between
bool operator op(const QString&, const QStringRef&)
bool operator op(const char*, const QStringRef&)
Fix by providing more overloads.
[ChangeLog][QtCore] Disambiguated the relational operators
comparing QByteArray with QStringRef (and vice versa).
Change-Id: I1cfa9ecfdd8b4102e652593faf35f6098289bc34
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
-rw-r--r-- | src/corelib/tools/qstring.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 7a13f2087b..f49ae28e76 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -9397,6 +9397,24 @@ QStringRef QStringRef::appendTo(QString *string) const */ /*! + \overload + \fn int QStringRef::compare(const QByteArray &other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const + \since 5.8 + + Compares this string with \a other and returns an + integer less than, equal to, or greater than zero if this string + is less than, equal to, or greater than the \a other byte array, + interpreted as a UTF-8 sequence. + + If \a cs is Qt::CaseSensitive, the comparison is case sensitive; + otherwise the comparison is case insensitive. + + Equivalent to \c {compare(*this, other, cs)}. + + \sa QString::compare() +*/ + +/*! \fn int QStringRef::localeAwareCompare(const QStringRef &s1, const QString & s2) \since 4.5 |