1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QSyntaxHighlighterPrivate: use erase and std::remove_if with QVector

Browse Source 
... instead of using erase in a loop, with quadratic complexity.

Change-Id: If30c6c99a775aec07eef9ddf953e944dc916b5a2
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Anton Kudryavtsev 2015-12-24 17:00:58 +03:00
parent b4c11c7cc5
commit 2ccacfb5c9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,8 @@
#include <qdebug.h> #include <qdebug.h>
#include <qtimer.h> #include <qtimer.h>
#include <algorithm>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QSyntaxHighlighterPrivate : public QObjectPrivate class QSyntaxHighlighterPrivate : public QObjectPrivate
@ -96,15 +98,15 @@ void QSyntaxHighlighterPrivate::applyFormatChanges()
const int preeditAreaLength = layout->preeditAreaText().length(); const int preeditAreaLength = layout->preeditAreaText().length();
if (preeditAreaLength != 0) { if (preeditAreaLength != 0) {
QVector<QTextLayout::FormatRange>::Iterator it = ranges.begin(); auto isOutsidePreeditArea = [=](const QTextLayout::FormatRange &range) {
while (it != ranges.end()) { return range.start < preeditAreaStart
if (it->start >= preeditAreaStart || range.start + range.length > preeditAreaStart + preeditAreaLength;
&& it->start + it->length <= preeditAreaStart + preeditAreaLength) { };
++it; const auto it = std::remove_if(ranges.begin(), ranges.end(),
} else { isOutsidePreeditArea);
it = ranges.erase(it); if (it != ranges.end()) {
formatsChanged = true; ranges.erase(it, ranges.end());
} formatsChanged = true;
} }
} else if (!ranges.isEmpty()) { } else if (!ranges.isEmpty()) {
ranges.clear(); ranges.clear();