diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-01-26 14:38:54 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-02-11 23:18:39 +0000 |
| commit | 37a933c2b14a4a1aad54af0eba0bc210ae5b549a (patch) | |
| tree | 04c4d7f34b23a5e5f3de09adfc900ebf7f700103 /src/gui/opengl | |
| parent | d09cfe04b82c1bd0738bca24def1e9c3bfdaaa4b (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/opengl')
| -rw-r--r-- | src/gui/opengl/qopenglframebufferobject.cpp | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglshaderprogram.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index c1b2e10785..6110764094 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -943,7 +943,7 @@ QOpenGLFramebufferObject::~QOpenGLFramebufferObject() if (isBound()) release(); - foreach (const QOpenGLFramebufferObjectPrivate::ColorAttachment &color, d->colorAttachments) { + for (const auto &color : qAsConst(d->colorAttachments)) { if (color.guard) color.guard->free(); } diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp index 1e0abbfab9..a32c111178 100644 --- a/src/gui/opengl/qopenglshaderprogram.cpp +++ b/src/gui/opengl/qopenglshaderprogram.cpp @@ -986,7 +986,7 @@ void QOpenGLShaderProgram::removeAllShaders() { Q_D(QOpenGLShaderProgram); d->removingShaders = true; - foreach (QOpenGLShader *shader, d->shaders) { + for (QOpenGLShader *shader : qAsConst(d->shaders)) { if (d->programGuard && d->programGuard->id() && shader && shader->d_func()->shaderGuard) { |