From 400ef69b4ebd9bfe809621ae348b4ddb6c336505 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Sat, 16 Jan 2021 22:08:03 +0100 Subject: RenderHelpers: use const iterators --- src/renderers/renderhelpers.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/renderers/renderhelpers.cpp') diff --git a/src/renderers/renderhelpers.cpp b/src/renderers/renderhelpers.cpp index f1f6087..c89667f 100644 --- a/src/renderers/renderhelpers.cpp +++ b/src/renderers/renderhelpers.cpp @@ -120,10 +120,10 @@ void setColor(QTextCharFormat& format, unsigned char n, bool bg=false) } } -QString parseNumber(const QString& input, QString::iterator& it) +QString parseNumber(const QString& input, QString::const_iterator& it) { QString result; - while (it != input.end()) + while (it != input.cend()) { const auto currentCharacter = *it; if (!currentCharacter.isNumber()) break; @@ -136,13 +136,13 @@ QString parseNumber(const QString& input, QString::iterator& it) void parseSGR( std::vector& args, const QString& input, - QString::iterator& it, + QString::const_iterator& it, QTextCharFormat& format, const QTextCharFormat& defaultFormat, QTextCursor& cursor) { if (args.empty()) return; - for (auto it = args.begin(); it != args.end(); ++it) + for (auto it = args.cbegin(); it != args.cend(); ++it) { const auto arg = *it; switch(arg) @@ -266,7 +266,7 @@ void parseSGR( } } -std::vector parseNumericArguments(const QString& input, QString::iterator& it) +std::vector parseNumericArguments(const QString& input, QString::const_iterator& it) { std::vector result; while (it != input.end()) @@ -292,14 +292,14 @@ std::vector parseNumericArguments(const QString& input, QString:: void parseCSI( const QString& input, - QString::iterator& it, + QString::const_iterator& it, QTextCharFormat& format, const QTextCharFormat& defaultFormat, QTextCursor& cursor) { std::vector numericArguments = parseNumericArguments(input, it); char numericArgument = numericArguments.empty() ? 1 : numericArguments[0]; - if (it != input.end()) + if (it != input.cend()) { const auto code = (*it).unicode(); switch(code) @@ -374,7 +374,7 @@ void RenderEscapeCodes(const QByteArray &input, const QTextCharFormat& format, Q auto textFormat = format; const auto tokens = input.split(escapeString); const auto inputString = QString::fromUtf8(input); - for (QString::iterator it = const_cast(inputString.begin()); it != inputString.end(); ++it) + for (QString::const_iterator it = inputString.cbegin(); it != inputString.cend(); ++it) { const auto currentCharacter = *it;; if (currentCharacter == escapeString) -- cgit v1.2.3