From d9b1fbf4d546ba52bd23f3758ab8055129dacba7 Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Date: Mon, 7 Dec 2015 16:59:20 +0300 Subject: [PATCH] CanvasContext, CanvasGlCommandQueue: use prefix ++ for iterator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit because it's useful for non-primitive types Change-Id: Ic0a53b24148c5815b881d72eecadcaa4ca1ed3e5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com> --- src/imports/qtcanvas3d/context3d.cpp | 4 ++-- src/imports/qtcanvas3d/glcommandqueue.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/imports/qtcanvas3d/context3d.cpp b/src/imports/qtcanvas3d/context3d.cpp index 8700319..9e77af7 100644 --- a/src/imports/qtcanvas3d/context3d.cpp +++ b/src/imports/qtcanvas3d/context3d.cpp @@ -2354,7 +2354,7 @@ QJSValue CanvasContext::getAttachedShaders(QJSValue program3D) QJSValue shaderList = m_engine->newArray(shaders.count()); for (QList<CanvasShader *>::const_iterator iter = shaders.constBegin(); - iter != shaders.constEnd(); iter++) { + iter != shaders.constEnd(); ++iter) { CanvasShader *shader = *iter; shaderList.setProperty(index++, m_engine->newQObject((CanvasShader *)shader)); } @@ -6144,7 +6144,7 @@ void CanvasContext::markQuickTexturesDirty() QMap<QQuickItem *, CanvasTexture *>::iterator i = m_quickItemToTextureMap.begin(); while (i != m_quickItemToTextureMap.end()) { m_commandQueue->addQuickItemAsTexture(i.key(), i.value()->textureId()); - i++; + ++i; } } } diff --git a/src/imports/qtcanvas3d/glcommandqueue.cpp b/src/imports/qtcanvas3d/glcommandqueue.cpp index c75a720..2bfb7da 100644 --- a/src/imports/qtcanvas3d/glcommandqueue.cpp +++ b/src/imports/qtcanvas3d/glcommandqueue.cpp @@ -413,7 +413,7 @@ void CanvasGlCommandQueue::clearResourceMaps() << commandId << "Resource:" << glId; break; } - i++; + ++i; } } @@ -423,14 +423,14 @@ void CanvasGlCommandQueue::clearResourceMaps() while (si != m_shaderMap.constEnd()) { QOpenGLShader *shader = si.value(); delete shader; - si++; + ++si; } QMap<GLint, QOpenGLShaderProgram *>::const_iterator pi = m_programMap.constBegin(); while (pi != m_programMap.constEnd()) { QOpenGLShaderProgram *program = pi.value(); delete program; - pi++; + ++pi; } m_resourceIdMap.clear(); -- GitLab