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

Avoid recreating QRegularExpression for every text block 

With very complex regular expressions this makes a significant
difference in performance.

Change-Id: I5267bf71cae98dffb58ec7a1fc982dae639ff312
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
bb10
Joni Poikelin 2020-03-25 12:15:17 +02:00
parent 7b5e4b6944
commit d0b30de542
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/text/qtextdocument.cpp
View File

@ -1547,15 +1547,9 @@ QTextCursor QTextDocument::find(const QRegExp &expr, const QTextCursor &cursor,
#endif // QT_REGEXP
#if QT_CONFIG(regularexpression)
static bool findInBlock(const QTextBlock &block, const QRegularExpression &expression, int offset,
static bool findInBlock(const QTextBlock &block, const QRegularExpression &expr, int offset,
QTextDocument::FindFlags options, QTextCursor *cursor)
{
QRegularExpression expr(expression);
if (!(options & QTextDocument::FindCaseSensitively))
expr.setPatternOptions(expr.patternOptions() | QRegularExpression::CaseInsensitiveOption);
else
expr.setPatternOptions(expr.patternOptions() & ~QRegularExpression::CaseInsensitiveOption);
QString text = block.text();
text.replace(QChar::Nbsp, QLatin1Char(' '));
QRegularExpressionMatch match;
@ -1623,16 +1617,22 @@ QTextCursor QTextDocument::find(const QRegularExpression &expr, int from, FindFl
QTextBlock block = d->blocksFind(pos);
int blockOffset = pos - block.position();
QRegularExpression expression(expr);
if (!(options & QTextDocument::FindCaseSensitively))
expression.setPatternOptions(expr.patternOptions() | QRegularExpression::CaseInsensitiveOption);
else
expression.setPatternOptions(expr.patternOptions() & ~QRegularExpression::CaseInsensitiveOption);
if (!(options & FindBackward)) {
while (block.isValid()) {
if (findInBlock(block, expr, blockOffset, options, &cursor))
if (findInBlock(block, expression, blockOffset, options, &cursor))
return cursor;
block = block.next();
blockOffset = 0;
}
} else {
while (block.isValid()) {
if (findInBlock(block, expr, blockOffset, options, &cursor))
if (findInBlock(block, expression, blockOffset, options, &cursor))
return cursor;
block = block.previous();
blockOffset = block.length() - 1;