diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-31 18:04:04 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-31 21:46:32 +0200 |
| commit | 529f052add3edbc1afb063a5cbbb118b67434fb6 (patch) | |
| tree | 8d4b3c3a961bd4a07e2d03de36e3abf8e283d97a /examples | |
| parent | 32a39c4ed1802eab7454d3e6007ff02aa9581b66 (diff) | |
Port QRegularExpression to QStringView, drop QStringRef
The idea is pretty simple -- add QRegularExpression matching over
QStringView. When matching over a QString, keep the string
alive (by taking a copy), and set the view onto that string.
Otherwise, just use the view provided by the user (who is then
responsible for ensuring the data stays valid while matching).
Do just minor refactorings to support this use case in a cleaner
fashion.
In QRegularExpressionMatch drop the QStringRef-returning methods, as
they cannot work any more -- in the general case there won't be a
QString to build a QStringRef from.
[ChangeLog][QtCore][QRegularExpression] All the APIs dealing
with QStringRef have been ported to QStringView, following
QStringRef deprecation in Qt 6.0.
Change-Id: Ic367991d9583cc108c045e4387c9b7288c8f1ffd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/tools/codecs/mainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/tools/codecs/mainwindow.cpp b/examples/widgets/tools/codecs/mainwindow.cpp index dfd2ff452a..2379eaf5cc 100644 --- a/examples/widgets/tools/codecs/mainwindow.cpp +++ b/examples/widgets/tools/codecs/mainwindow.cpp @@ -162,7 +162,7 @@ void MainWindow::findCodecs() } else if (sortKey.startsWith(QLatin1String("UTF-16"))) { rank = 2; } else if ((match = iso8859RegExp.match(sortKey)).hasMatch()) { - if (match.capturedRef(1).size() == 1) + if (match.capturedView(1).size() == 1) rank = 3; else rank = 4; |