From 678112c6fd76afa68216845c4e8dc86708050e63 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 25 Jan 2019 12:04:49 +0100 Subject: [PATCH] Avoid a few unnecessary non-const QString::operator[]() accesses Change-Id: I44cbc418ce073da9b70df0e2d0851006140aaaf9 Reviewed-by: Alessandro Portale --- src/libs/utils/ansiescapecodehandler.cpp | 6 +++--- src/libs/utils/differ.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/ansiescapecodehandler.cpp b/src/libs/utils/ansiescapecodehandler.cpp index dce3482b930..70a4dff36e5 100644 --- a/src/libs/utils/ansiescapecodehandler.cpp +++ b/src/libs/utils/ansiescapecodehandler.cpp @@ -98,7 +98,7 @@ QList AnsiEscapeCodeHandler::parseText(const FormattedText &input while (!strippedText.isEmpty()) { QTC_ASSERT(m_pendingText.isEmpty(), break); - const int escapePos = strippedText.indexOf(escape[0]); + const int escapePos = strippedText.indexOf(escape.at(0)); if (escapePos < 0) { outputData << FormattedText(strippedText, charFormat); break; @@ -106,9 +106,9 @@ QList AnsiEscapeCodeHandler::parseText(const FormattedText &input outputData << FormattedText(strippedText.left(escapePos), charFormat); strippedText.remove(0, escapePos); } - QTC_ASSERT(strippedText[0] == escape[0], break); + QTC_ASSERT(strippedText.at(0) == escape.at(0), break); - while (!strippedText.isEmpty() && escape[0] == strippedText[0]) { + while (!strippedText.isEmpty() && escape.at(0) == strippedText.at(0)) { if (escape.startsWith(strippedText)) { // control secquence is not complete m_pendingText += strippedText; diff --git a/src/libs/utils/differ.cpp b/src/libs/utils/differ.cpp index cff9dd21dbf..16fc0ced01e 100644 --- a/src/libs/utils/differ.cpp +++ b/src/libs/utils/differ.cpp @@ -1516,9 +1516,9 @@ QList Differ::cleanupSemanticsLossless(const QList &diffList) + cleanupSemanticsScore(edit, equality2); while (!edit.isEmpty() && !equality2.isEmpty() - && edit[0] == equality2[0]) { - equality1 += edit[0]; - edit = edit.mid(1) + equality2[0]; + && edit.at(0) == equality2.at(0)) { + equality1 += edit.at(0); + edit = edit.mid(1) + equality2.at(0); equality2 = equality2.mid(1); const int score = cleanupSemanticsScore(equality1, edit) + cleanupSemanticsScore(edit, equality2);