diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-02-09 12:05:17 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-02-11 19:25:38 +0000 |
| commit | 3ff5251740f4c4cca74177cc977ebe7df6e7f92b (patch) | |
| tree | 8df5ae3122f6c8595af393c105aec6730fca40a0 /src | |
| parent | 2523f62939948f383178054c2d061711c0413348 (diff) | |
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) <ogoffart@woboq.com>
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/opengl/qopengldebug.cpp | 6 | ||||
| -rw-r--r-- | 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); |