From fd7861ac4bd5ee955e1ae0f376a6212757709d01 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 23 Dec 2015 00:15:30 +0100 Subject: 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 Reviewed-by: Sean Harmer --- src/opengl/qglshaderprogram.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/opengl/qglshaderprogram.cpp') 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); -- cgit v1.2.3