whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSyntaxHighlighter: minor code de-duplication 

The (r.start != -1) case is equal to (i == formatChanges.count()) case
in the loop; no need to exit the loop just to do exactly what it did.

Change-Id: I4129d8012399895c2fce70b26716ca5aeadee79c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
bb10
Konstantin Ritt 2012-10-27 09:11:36 +03:00 committed by The Qt Project
parent f05a392f3e
commit 3a333f2d92
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/text/qsyntaxhighlighter.cpp
View File

@ -119,18 +119,14 @@ void QSyntaxHighlighterPrivate::applyFormatChanges()
formatsChanged = true;
}
QTextCharFormat emptyFormat;
QTextLayout::FormatRange r;
r.start = -1;
int i = 0;
while (i < formatChanges.count()) {
QTextLayout::FormatRange r;
while (i < formatChanges.count() && formatChanges.at(i) == emptyFormat)
while (i < formatChanges.count() && formatChanges.at(i) == r.format)
++i;
if (i >= formatChanges.count())
if (i == formatChanges.count())
break;
r.start = i;
@ -139,9 +135,7 @@ void QSyntaxHighlighterPrivate::applyFormatChanges()
while (i < formatChanges.count() && formatChanges.at(i) == r.format)
++i;
if (i >= formatChanges.count())
break;
Q_ASSERT(i <= formatChanges.count());
r.length = i - r.start;
if (preeditAreaLength != 0) {
@ -151,21 +145,6 @@ void QSyntaxHighlighterPrivate::applyFormatChanges()
r.length += preeditAreaLength;
}
ranges << r;
formatsChanged = true;
r.start = -1;
}
if (r.start != -1) {
r.length = formatChanges.count() - r.start;
if (preeditAreaLength != 0) {
if (r.start >= preeditAreaStart)
r.start += preeditAreaLength;
else if (r.start + r.length >= preeditAreaStart)
r.length += preeditAreaLength;
}
ranges << r;
formatsChanged = true;
}