diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-13 15:18:07 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-28 21:29:06 +0200 |
| commit | 0d11a92af9003c8c68a5e0fca40c8e94ae34cbce (patch) | |
| tree | c00ddbb4f4ff51b8e2c7cc665b38b74c19e3a184 /src/corelib/text | |
| parent | 69014b6cd62ed3fb2f57f9ad04d29a06411c55aa (diff) | |
QLatin1String: finish up the qsizetype conversion
Correct one QString::lastIndexOf() whose return and parameter had been
changed, but body and comment hadn't.
Task-number: QTBUG-85700
Change-Id: Icbcd049f72346f0e696e6b22fe0893f6de5a2646
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/text')
| -rw-r--r-- | src/corelib/text/qstring.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index 7f5e460275..6456c088bb 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2019 Intel Corporation. ** Copyright (C) 2019 Mail.ru Group. ** Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com> @@ -411,7 +411,7 @@ public: #endif Q_REQUIRED_RESULT qsizetype lastIndexOf(QStringView s, qsizetype from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept - { return int(QtPrivate::lastIndexOf(*this, from, s, cs)); } // ### Qt6: qsizetype + { return QtPrivate::lastIndexOf(*this, from, s, cs); } inline bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; #if QT_STRINGVIEW_LEVEL < 2 |