diff options
author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-11 13:41:55 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-11 16:55:37 +0200 |
commit | 187ec2e0929ee8e588195332c61810bd0c0fe75b (patch) | |
tree | 04d53aa8e54577fbb7767f337edf9146fe5fcf6d /src | |
parent | 634269c4c0f3f0772506ae1bb15be5e814e43454 (diff) | |
download | qtwayland-187ec2e0929ee8e588195332c61810bd0c0fe75b.tar.gz |
Qt6: Port QtWayland from QStringRef to QStringView
Task-number: QTBUG-84319
Change-Id: I5dc2f4506c149e5f2793cd7cab083278b93a980e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/client/qwaylandwindow.cpp | 2 | ||||
-rw-r--r-- | src/shared/qwaylandinputmethodeventbuilder.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index fa2a5b74..802be1e0 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -307,7 +307,7 @@ void QWaylandWindow::setWindowTitle(const QString &title) // three bytes when converted to utf-8 (which is what libwayland uses), so divide by three. const int maxLength = libwaylandMaxBufferSize / 3 - 100; - auto truncated = QStringRef(&formatted).left(maxLength); + auto truncated = QStringView{formatted}.left(maxLength); if (truncated.length() < formatted.length()) { qCWarning(lcQpaWayland) << "Window titles longer than" << maxLength << "characters are not supported." << "Truncating window title (from" << formatted.length() << "chars)"; diff --git a/src/shared/qwaylandinputmethodeventbuilder.cpp b/src/shared/qwaylandinputmethodeventbuilder.cpp index 526d0ef4..5f3c8a55 100644 --- a/src/shared/qwaylandinputmethodeventbuilder.cpp +++ b/src/shared/qwaylandinputmethodeventbuilder.cpp @@ -265,17 +265,17 @@ int QWaylandInputMethodEventBuilder::indexFromWayland(const QString &text, int l return base; if (length < 0) { - const QByteArray &utf8 = text.leftRef(base).toUtf8(); + const QByteArray &utf8 = QStringView{text}.left(base).toUtf8(); return QString::fromUtf8(utf8.left(qMax(utf8.length() + length, 0))).length(); } else { - const QByteArray &utf8 = text.midRef(base).toUtf8(); + const QByteArray &utf8 = QStringView{text}.mid(base).toUtf8(); return QString::fromUtf8(utf8.left(length)).length() + base; } } int QWaylandInputMethodEventBuilder::indexToWayland(const QString &text, int length, int base) { - return text.midRef(base, length).toUtf8().size(); + return QStringView{text}.mid(base, length).toUtf8().size(); } QT_END_NAMESPACE |