From 3ff5251740f4c4cca74177cc977ebe7df6e7f92b Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 9 Feb 2016 12:05:17 +0100 Subject: [PATCH] QtGui: eradicate Q_FOREACH loops [QVarLengthArray] Q_FOREACH over a QVarLengthArray is a partcularly bad idea. Use C++11 range-for (without qAsConst(), because QVLA isn't CoW). Change-Id: I5ee55557577f183151d3871e4518382c4adf0237 Reviewed-by: Olivier Goffart (Woboq GmbH) Reviewed-by: Gunnar Sletta Reviewed-by: Lars Knoll --- src/gui/opengl/qopengldebug.cpp | 6 +++--- src/gui/text/qtextengine.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/opengl/qopengldebug.cpp b/src/gui/opengl/qopengldebug.cpp index 092025c224..0132dc03bb 100644 --- a/src/gui/opengl/qopengldebug.cpp +++ b/src/gui/opengl/qopengldebug.cpp @@ -1276,9 +1276,9 @@ void QOpenGLDebugLoggerPrivate::controlDebugMessages(QOpenGLDebugMessage::Source // Unfortunately, some bugged drivers do NOT ignore it, so pass NULL in case. const GLuint * const idPtr = idCount ? ids.constData() : 0; - foreach (GLenum source, glSources) - foreach (GLenum type, glTypes) - foreach (GLenum severity, glSeverities) + for (GLenum source : glSources) + for (GLenum type : glTypes) + for (GLenum severity : glSeverities) glDebugMessageControl(source, type, severity, idCount, idPtr, GLboolean(enable)); } diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index a1df41e89f..81df8027a1 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -3040,7 +3040,7 @@ void QTextEngine::resolveFormats() const format = collection->charFormat(formatIndex(si)); } if (!currentFormats.isEmpty()) { - foreach (int cur, currentFormats) { + for (int cur : currentFormats) { const QTextLayout::FormatRange &range = specialData->formats.at(cur); Q_ASSERT(range.start <= si->position && range.start + range.length >= end); format.merge(range.format);