diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-06-17 22:53:53 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-06-25 09:54:16 +0200 |
| commit | d7ccd8cb4565c8643b158891c9de3187c1586dc9 (patch) | |
| tree | 5f3fbd8a91cf2c460891453497f8e4b8ac2f82ba /src/corelib/text/qstring.h | |
| parent | 2df4991cb1a893522caac838d6c4edf5ad8da464 (diff) | |
Remove QByteArray's methods taking QString and their uses
[ChangeLog][QtCore][QByteArray] Remove method overloads taking
QString as argument, all of which were equivalent to passing the
toUtf8() of the string instead.
Change-Id: I9251733a9b3711153b2faddbbc907672a7cba190
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/text/qstring.h')
| -rw-r--r-- | src/corelib/text/qstring.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index b77c6134d5..199650be0b 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -1274,39 +1274,8 @@ inline QT_ASCII_CAST_WARN bool QString::operator<=(const QByteArray &s) const inline QT_ASCII_CAST_WARN bool QString::operator>=(const QByteArray &s) const { return QString::compare_helper(constData(), size(), s.constData(), s.size()) >= 0; } -inline bool QByteArray::operator==(const QString &s) const -{ return QString::compare_helper(s.constData(), s.size(), constData(), qstrnlen(constData(), size())) == 0; } -inline bool QByteArray::operator!=(const QString &s) const -{ return QString::compare_helper(s.constData(), s.size(), constData(), qstrnlen(constData(), size())) != 0; } -inline bool QByteArray::operator<(const QString &s) const -{ return QString::compare_helper(s.constData(), s.size(), constData(), size()) > 0; } -inline bool QByteArray::operator>(const QString &s) const -{ return QString::compare_helper(s.constData(), s.size(), constData(), size()) < 0; } -inline bool QByteArray::operator<=(const QString &s) const -{ return QString::compare_helper(s.constData(), s.size(), constData(), size()) >= 0; } -inline bool QByteArray::operator>=(const QString &s) const -{ return QString::compare_helper(s.constData(), s.size(), constData(), size()) <= 0; } #endif // !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII) -#ifndef QT_NO_CAST_TO_ASCII -inline QByteArray &QByteArray::append(const QString &s) -{ return append(s.toUtf8()); } -inline QByteArray &QByteArray::insert(int i, const QString &s) -{ return insert(i, s.toUtf8()); } -inline QByteArray &QByteArray::replace(char c, const QString &after) -{ return replace(c, after.toUtf8()); } -inline QByteArray &QByteArray::replace(const QString &before, const char *after) -{ return replace(before.toUtf8(), after); } -inline QByteArray &QByteArray::replace(const QString &before, const QByteArray &after) -{ return replace(before.toUtf8(), after); } -inline QByteArray &QByteArray::operator+=(const QString &s) -{ return operator+=(s.toUtf8()); } -inline int QByteArray::indexOf(const QString &s, int from) const -{ return indexOf(s.toUtf8(), from); } -inline int QByteArray::lastIndexOf(const QString &s, int from) const -{ return lastIndexOf(s.toUtf8(), from); } -#endif // QT_NO_CAST_TO_ASCII - #if !defined(QT_USE_FAST_OPERATOR_PLUS) && !defined(QT_USE_QSTRINGBUILDER) inline const QString operator+(const QString &s1, const QString &s2) { QString t(s1); t += s2; return t; } |