summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextdocument_p.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-01-26 14:38:54 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-02-11 23:18:39 +0000
commit37a933c2b14a4a1aad54af0eba0bc210ae5b549a (patch)
tree04c4d7f34b23a5e5f3de09adfc900ebf7f700103 /src/gui/text/qtextdocument_p.cpp
parentd09cfe04b82c1bd0738bca24def1e9c3bfdaaa4b (diff)
QtGui: eradicate Q_FOREACH loops [needing qAsConst()]
... by replacing them with C++11 range-for loops. To avoid detaches of these mutable Qt containers, wrap the container in qAsConst(). Change-Id: I90fd517ad542ef92034403c15ebb8300a56ac693 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Diffstat (limited to 'src/gui/text/qtextdocument_p.cpp')
-rw-r--r--src/gui/text/qtextdocument_p.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index cfca718f01..5cb9e1bb74 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -235,7 +235,7 @@ void QTextDocumentPrivate::clear()
{
Q_Q(QTextDocument);
- foreach (QTextCursorPrivate *curs, cursors) {
+ for (QTextCursorPrivate *curs : qAsConst(cursors)) {
curs->setPosition(0);
curs->currentCharFormat = -1;
curs->anchor = 0;
@@ -287,7 +287,7 @@ void QTextDocumentPrivate::clear()
QTextDocumentPrivate::~QTextDocumentPrivate()
{
- foreach (QTextCursorPrivate *curs, cursors)
+ for (QTextCursorPrivate *curs : qAsConst(cursors))
curs->priv = 0;
cursors.clear();
undoState = 0;
@@ -674,7 +674,7 @@ void QTextDocumentPrivate::remove(int pos, int length, QTextUndoCommand::Operati
blockCursorAdjustment = true;
move(pos, -1, length, op);
blockCursorAdjustment = false;
- foreach (QTextCursorPrivate *curs, cursors) {
+ for (QTextCursorPrivate *curs : qAsConst(cursors)) {
if (curs->adjustPosition(pos, -length, op) == QTextCursorPrivate::CursorMoved) {
curs->changed = true;
}
@@ -1232,13 +1232,13 @@ void QTextDocumentPrivate::finishEdit()
}
QList<QTextCursor> changedCursors;
- foreach (QTextCursorPrivate *curs, cursors) {
+ for (QTextCursorPrivate *curs : qAsConst(cursors)) {
if (curs->changed) {
curs->changed = false;
changedCursors.append(QTextCursor(curs));
}
}
- foreach (const QTextCursor &cursor, changedCursors)
+ for (const QTextCursor &cursor : qAsConst(changedCursors))
emit q->cursorPositionChanged(cursor);
contentsChanged();
@@ -1284,7 +1284,7 @@ void QTextDocumentPrivate::adjustDocumentChangesAndCursors(int from, int addedOr
if (blockCursorAdjustment) {
; // postpone, will be called again from QTextDocumentPrivate::remove()
} else {
- foreach (QTextCursorPrivate *curs, cursors) {
+ for (QTextCursorPrivate *curs : qAsConst(cursors)) {
if (curs->adjustPosition(from, addedOrRemoved, op) == QTextCursorPrivate::CursorMoved) {
curs->changed = true;
}
@@ -1731,7 +1731,7 @@ bool QTextDocumentPrivate::ensureMaximumBlockCount()
void QTextDocumentPrivate::aboutToRemoveCell(int from, int to)
{
Q_ASSERT(from <= to);
- foreach (QTextCursorPrivate *curs, cursors)
+ for (QTextCursorPrivate *curs : qAsConst(cursors))
curs->aboutToRemoveCell(from, to);
}