whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Marc Mutz 2015-12-23 00:15:30 +01:00
parent 41ca17fa97
commit fd7861ac4b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opengl/qglshaderprogram.cpp
View File

@ -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);