diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-12-23 00:15:30 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-01-04 12:22:23 +0000 |
commit | fd7861ac4bd5ee955e1ae0f376a6212757709d01 (patch) | |
tree | ddff9440712c1131834a6232dcaed81a5afa641a /src/opengl | |
parent | 41ca17fa97d8595b974f09ef43ea2aeff7aab32b (diff) |
QtOpenGL: eradicate all remaining Q_FOREACH loops
Not many left. Still 344b saved in text size on optimized
GCC 4.9 Linux AMD64 builds.
Change-Id: I51ba49fe065854f84e26d25d7da5e26427ea2c0b
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/qglshaderprogram.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index c1b5d8d50d..5c2cff8d8c 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -626,7 +626,7 @@ QGLShaderProgramPrivate::~QGLShaderProgramPrivate() bool QGLShaderProgramPrivate::hasShader(QGLShader::ShaderType type) const { - foreach (QGLShader *shader, shaders) { + for (QGLShader *shader : shaders) { if (shader->shaderType() == type) return true; } @@ -876,7 +876,7 @@ void QGLShaderProgram::removeAllShaders() d->removingShaders = true; if (d->programGuard) { if (const auto programGuardId = d->programGuard->id()) { - foreach (QGLShader *shader, d->shaders) { + for (QGLShader *shader : qAsConst(d->shaders)) { if (shader && shader->d_func()->shaderGuard) d->glfuncs->glDetachShader(programGuardId, shader->d_func()->shaderGuard->id()); } @@ -928,7 +928,7 @@ bool QGLShaderProgram::link() // Set up the geometry shader parameters if (!QOpenGLContext::currentContext()->isOpenGLES() && d->glfuncs->glProgramParameteri) { - foreach (QGLShader *shader, d->shaders) { + for (QGLShader *shader : qAsConst(d->shaders)) { if (shader->shaderType() & QGLShader::Geometry) { d->glfuncs->glProgramParameteri(program, GL_GEOMETRY_INPUT_TYPE_EXT, d->geometryInputType); |