diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-11-11 16:26:04 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-11-18 13:59:41 +0100 |
commit | 3a07c391847b81c7bf40d95fc4d7c49f63073abc (patch) | |
tree | ae481ec0170e6cd53cbd09a28fc780fe0ab467d2 /src/gui/text/qtextdocument_p.cpp | |
parent | c5f3c61469517a4ac00e4da01fe0bab9188c1488 (diff) | |
download | qtbase-3a07c391847b81c7bf40d95fc4d7c49f63073abc.tar.gz |
Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.
Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.
This is a 6.4 re-run of the script we ran in dev, in order to avoid
conflicts between the branches when cherry-picking.
Change-Id: I5eca3df3179dfb2b2682c75a479ba9a4259cc703
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/text/qtextdocument_p.cpp')
-rw-r--r-- | src/gui/text/qtextdocument_p.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp index 0b9be23271..7c4ca0abc2 100644 --- a/src/gui/text/qtextdocument_p.cpp +++ b/src/gui/text/qtextdocument_p.cpp @@ -202,7 +202,7 @@ void QTextDocumentPrivate::clear() { Q_Q(QTextDocument); - for (QTextCursorPrivate *curs : qAsConst(cursors)) { + for (QTextCursorPrivate *curs : std::as_const(cursors)) { curs->setPosition(0); curs->currentCharFormat = -1; curs->anchor = 0; @@ -255,7 +255,7 @@ void QTextDocumentPrivate::clear() QTextDocumentPrivate::~QTextDocumentPrivate() { - for (QTextCursorPrivate *curs : qAsConst(cursors)) + for (QTextCursorPrivate *curs : std::as_const(cursors)) curs->priv = nullptr; cursors.clear(); undoState = 0; @@ -646,7 +646,7 @@ void QTextDocumentPrivate::remove(int pos, int length, QTextUndoCommand::Operati blockCursorAdjustment = true; move(pos, -1, length, op); blockCursorAdjustment = false; - for (QTextCursorPrivate *curs : qAsConst(cursors)) { + for (QTextCursorPrivate *curs : std::as_const(cursors)) { if (curs->adjustPosition(pos, -length, op) == QTextCursorPrivate::CursorMoved) { curs->changed = true; } @@ -1204,13 +1204,13 @@ void QTextDocumentPrivate::finishEdit() } QList<QTextCursor> changedCursors; - for (QTextCursorPrivate *curs : qAsConst(cursors)) { + for (QTextCursorPrivate *curs : std::as_const(cursors)) { if (curs->changed) { curs->changed = false; changedCursors.append(QTextCursor(curs)); } } - for (const QTextCursor &cursor : qAsConst(changedCursors)) + for (const QTextCursor &cursor : std::as_const(changedCursors)) emit q->cursorPositionChanged(cursor); contentsChanged(); @@ -1256,7 +1256,7 @@ void QTextDocumentPrivate::adjustDocumentChangesAndCursors(int from, int addedOr if (blockCursorAdjustment) { ; // postpone, will be called again from QTextDocumentPrivate::remove() } else { - for (QTextCursorPrivate *curs : qAsConst(cursors)) { + for (QTextCursorPrivate *curs : std::as_const(cursors)) { if (curs->adjustPosition(from, addedOrRemoved, op) == QTextCursorPrivate::CursorMoved) { curs->changed = true; } @@ -1703,7 +1703,7 @@ bool QTextDocumentPrivate::ensureMaximumBlockCount() void QTextDocumentPrivate::aboutToRemoveCell(int from, int to) { Q_ASSERT(from <= to); - for (QTextCursorPrivate *curs : qAsConst(cursors)) + for (QTextCursorPrivate *curs : std::as_const(cursors)) curs->aboutToRemoveCell(from, to); } |