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/qml/jsruntime/qv4stringobject.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/qml/jsruntime/qv4stringobject.cpp') diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index bf098fef26..97a8941fe1 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -464,7 +464,7 @@ ReturnedValue StringPrototype::method_endsWith(const FunctionObject *b, const Va if (pos == value.length()) RETURN_RESULT(Encode(value.endsWith(searchString))); - QStringRef stringToSearch = value.leftRef(pos); + QStringView stringToSearch = QStringView{value}.left(pos); return Encode(stringToSearch.endsWith(searchString)); } @@ -514,7 +514,7 @@ ReturnedValue StringPrototype::method_includes(const FunctionObject *b, const Va if (pos == 0) RETURN_RESULT(Encode(value.contains(searchString))); - QStringRef stringToSearch = value.midRef(pos); + QStringView stringToSearch = QStringView{value}.mid(pos); return Encode(stringToSearch.contains(searchString)); } @@ -765,7 +765,7 @@ static void appendReplacementString(QString *result, const QString &input, const } i += skip; if (substStart != JSC::Yarr::offsetNoMatch && substEnd != JSC::Yarr::offsetNoMatch) - *result += input.midRef(substStart, substEnd - substStart); + *result += QStringView{input}.mid(substStart, substEnd - substStart); else if (skip == 0) // invalid capture reference. Taken as literal value *result += replaceValue.at(i); } else { @@ -863,11 +863,11 @@ ReturnedValue StringPrototype::method_replace(const FunctionObject *b, const Val Value that = Value::undefinedValue(); replacement = searchCallback->call(&that, arguments, numCaptures + 2); CHECK_EXCEPTION(); - result += string.midRef(lastEnd, matchStart - lastEnd); + result += QStringView{string}.mid(lastEnd, matchStart - lastEnd); result += replacement->toQString(); lastEnd = matchEnd; } - result += string.midRef(lastEnd); + result += QStringView{string}.mid(lastEnd); } else { QString newString = replaceValue->toQString(); result.reserve(string.length() + numStringMatches*newString.size()); @@ -880,11 +880,11 @@ ReturnedValue StringPrototype::method_replace(const FunctionObject *b, const Val if (matchStart == JSC::Yarr::offsetNoMatch) continue; - result += string.midRef(lastEnd, matchStart - lastEnd); + result += QStringView{string}.mid(lastEnd, matchStart - lastEnd); appendReplacementString(&result, string, newString, matchOffsets + baseIndex, numCaptures); lastEnd = matchEnd; } - result += string.midRef(lastEnd); + result += QStringView{string}.mid(lastEnd); } if (matchOffsets != _matchOffsets) @@ -1052,7 +1052,7 @@ ReturnedValue StringPrototype::method_startsWith(const FunctionObject *b, const if (pos == 0) return Encode(value.startsWith(searchString)); - QStringRef stringToSearch = value.midRef(pos); + QStringView stringToSearch = QStringView{value}.mid(pos); RETURN_RESULT(Encode(stringToSearch.startsWith(searchString))); } -- cgit v1.2.3