From 1b10ce6a08edbc2ac7e8fd7e97e3fc691f2081df Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Tue, 16 Jun 2020 10:23:19 +0200 Subject: Port QtDeclarative from QStringRef to QStringView MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-84319 Change-Id: I2dcfb8a2db98282c7a1acdad1e6f4f949f26df15 Reviewed-by: Mårten Nordheim Reviewed-by: Shawn Rutledge Reviewed-by: Timur Pocheptsov --- src/quick/items/qquickscalegrid.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/quick/items/qquickscalegrid.cpp') diff --git a/src/quick/items/qquickscalegrid.cpp b/src/quick/items/qquickscalegrid.cpp index 23f179be1d..c2288cf220 100644 --- a/src/quick/items/qquickscalegrid.cpp +++ b/src/quick/items/qquickscalegrid.cpp @@ -140,8 +140,8 @@ QQuickGridScaledImage::QQuickGridScaledImage(QIODevice *data) if (colonId <= 0) return; - const QStringRef property = line.leftRef(colonId).trimmed(); - QStringRef value = line.midRef(colonId + 1).trimmed(); + const QStringView property = QStringView{line}.left(colonId).trimmed(); + QStringView value = QStringView{line}.mid(colonId + 1).trimmed(); if (property == QLatin1String("border.left")) { l = value.toInt(); @@ -169,9 +169,9 @@ QQuickGridScaledImage::QQuickGridScaledImage(QIODevice *data) _pix = imgFile; } -QQuickBorderImage::TileMode QQuickGridScaledImage::stringToRule(const QStringRef &s) +QQuickBorderImage::TileMode QQuickGridScaledImage::stringToRule(QStringView s) { - QStringRef string = s; + QStringView string = s; if (string.startsWith(QLatin1Char('"')) && string.endsWith(QLatin1Char('"'))) string = string.mid(1, string.size() - 2); // remove leading/trailing quotes. -- cgit v1.2.3