From ba5af03a5a505d4ef19ccea1c0170e50abf3db8c Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Tue, 14 Apr 2015 15:34:08 +0400 Subject: [QTextCursor] Better use of the cached whiteSpace attribute In compare to QTextEngine::atSpace(), this also handles the less-common "white spaces" and the exceptional control codes. Change-Id: I52878932926b7f9fe36c9dd01007963b9691fbf0 Reviewed-by: Simon Hausmann --- src/gui/text/qtextcursor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui/text/qtextcursor.cpp') diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp index a151c515a3..eb51447105 100644 --- a/src/gui/text/qtextcursor.cpp +++ b/src/gui/text/qtextcursor.cpp @@ -424,9 +424,9 @@ bool QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor // skip if already at word start QTextEngine *engine = layout->engine(); - engine->attributes(); + const QCharAttributes *attributes = engine->attributes(); if ((relativePos == blockIt.length() - 1) - && (engine->atSpace(relativePos - 1) || engine->atWordSeparator(relativePos - 1))) + && (attributes[relativePos - 1].whiteSpace || engine->atWordSeparator(relativePos - 1))) return false; if (relativePos < blockIt.length()-1) @@ -499,7 +499,7 @@ bool QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor } case QTextCursor::EndOfWord: { QTextEngine *engine = layout->engine(); - engine->attributes(); + const QCharAttributes *attributes = engine->attributes(); const int len = blockIt.length() - 1; if (relativePos >= len) return false; @@ -508,7 +508,7 @@ bool QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor while (relativePos < len && engine->atWordSeparator(relativePos)) ++relativePos; } else { - while (relativePos < len && !engine->atSpace(relativePos) && !engine->atWordSeparator(relativePos)) + while (relativePos < len && !attributes[relativePos].whiteSpace && !engine->atWordSeparator(relativePos)) ++relativePos; } newPosition = blockIt.position() + relativePos; -- cgit v1.2.3