Fix some more compile warnings

Change-Id: I5c42d2be7d06388609c46f9becaf147f7ce8d6ae
Reviewed-by: Mike Krus <mike.krus@kdab.com>

8 files changed, 11 insertions, 11 deletions

diff --git a/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp b/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp
index 3b6eb2e39..7fff82c03 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp
@@ -1188,7 +1188,7 @@ bool SubmissionContext::setParameters(ShaderParameterPack &parameterPack, GLShad
 
     // Fill Texture Uniform Value with proper texture units
     // so that they can be applied as regular uniforms in a second step
-    for (int i = 0; i < parameterPack.textures().size(); ++i) {
+    for (size_t i = 0; i < parameterPack.textures().size(); ++i) {
         const ShaderParameterPack::NamedResource &namedTex = parameterPack.textures().at(i);
         // Given a Texture QNodeId, we retrieve the associated shared GLTexture
         if (uniformValues.contains(namedTex.glslNameId)) {
@@ -1213,7 +1213,7 @@ bool SubmissionContext::setParameters(ShaderParameterPack &parameterPack, GLShad
 
     // Fill Image Uniform Value with proper image units
     // so that they can be applied as regular uniforms in a second step
-    for (int i = 0; i < parameterPack.images().size(); ++i) {
+    for (size_t i = 0; i < parameterPack.images().size(); ++i) {
         const ShaderParameterPack::NamedResource &namedTex = parameterPack.images().at(i);
         // Given a Texture QNodeId, we retrieve the associated shared GLTexture
         if (uniformValues.contains(namedTex.glslNameId)) {
diff --git a/src/plugins/renderers/opengl/renderer/renderview.cpp b/src/plugins/renderers/opengl/renderer/renderview.cpp
index 66bbd866b..7854c0ec5 100644
--- a/src/plugins/renderers/opengl/renderer/renderview.cpp
+++ b/src/plugins/renderers/opengl/renderer/renderview.cpp
@@ -420,7 +420,7 @@ struct SubRangeSorter<QSortPolicy::Texture>
             const std::vector<ShaderParameterPack::NamedResource> &smallestVector = bBigger ? texturesA : texturesB;
             const std::vector<ShaderParameterPack::NamedResource> &biggestVector = bBigger ? texturesB : texturesA;
 
-            int identicalTextureCount = 0;
+            size_t identicalTextureCount = 0;
             const auto e = biggestVector.cend();
             for (const ShaderParameterPack::NamedResource &tex : smallestVector) {
                 if (std::find(biggestVector.begin(), e, tex) != e)
@@ -534,7 +534,7 @@ void RenderView::sort()
         return;
 
     // Minimize uniform changes
-    int i = 0;
+    size_t i = 0;
     std::vector<RenderCommand> &commands = m_renderCommandDataView->data.commands;
     const std::vector<size_t> &indices = m_renderCommandDataView->indices;
     const size_t commandSize = indices.size();
diff --git a/src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp b/src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp
index 10899fbe0..a3d8c4b61 100644
--- a/src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp
+++ b/src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp
@@ -71,7 +71,7 @@ void ShaderParameterPack::setUniform(const int glslNameId, const UniformValue &v
 
 void ShaderParameterPack::setTexture(const int glslNameId, int uniformArrayIndex, Qt3DCore::QNodeId texId)
 {
-    for (int t=0; t<m_textures.size(); ++t) {
+    for (size_t t = 0; t < m_textures.size(); ++t) {
         if (m_textures[t].glslNameId != glslNameId || m_textures[t].uniformArrayIndex != uniformArrayIndex)
             continue;
 
diff --git a/src/render/backend/stringtoint.cpp b/src/render/backend/stringtoint.cpp
index bcc415eb1..b08d4336e 100644
--- a/src/render/backend/stringtoint.cpp
+++ b/src/render/backend/stringtoint.cpp
@@ -86,7 +86,7 @@ int StringToInt::lookupId(const QString &str)
         idx = cache.map.value(str, -1);
         if (idx < 0) {
             idx = cache.reverseMap.size();
-            Q_ASSERT(cache.map.size() == cache.reverseMap.size());
+            Q_ASSERT(size_t(cache.map.size()) == cache.reverseMap.size());
             cache.map.insert(str, idx);
             cache.reverseMap.push_back(str);
         }
diff --git a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp
index d95586664..97f35b880 100644
--- a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp
+++ b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp
@@ -398,7 +398,7 @@ void tst_QResourceManager::activeHandles()
         // WHEN
         const tHandle newHandle = manager.getOrAcquireHandle(883U);
         // THEN
-        QCOMPARE(manager.activeHandles().size(), 1);
+        QCOMPARE(manager.activeHandles().size(), size_t(1));
         QCOMPARE(manager.activeHandles()[0], newHandle);
     }
 
@@ -413,7 +413,7 @@ void tst_QResourceManager::activeHandles()
         // WHEN
         const tHandle newHandle = manager.acquire();
         // THEN
-        QCOMPARE(manager.activeHandles().size(), 1);
+        QCOMPARE(manager.activeHandles().size(), size_t(1));
         QCOMPARE(manager.activeHandles()[0], newHandle);
 
         // WHEN
diff --git a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp
index 556d99c3b..304e56172 100644
--- a/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp
+++ b/tests/auto/render/opengl/filtercompatibletechniquejob/tst_filtercompatibletechniquejob.cpp
@@ -241,7 +241,7 @@ private Q_SLOTS:
         QCOMPARE(testAspect.renderer()->isRunning(), true);
         QCOMPARE(testAspect.renderer()->submissionContext()->isInitialized(), true);
         const std::vector<Qt3DRender::Render::HTechnique> &handles = testAspect.nodeManagers()->techniqueManager()->activeHandles();
-        QCOMPARE(handles.size(), 3);
+        QCOMPARE(handles.size(), size_t(3));
 
         // WHEN
         backendFilterCompatibleTechniqueJob.run();
diff --git a/tests/auto/render/technique/tst_technique.cpp b/tests/auto/render/technique/tst_technique.cpp
index b36d00fee..c527a0697 100644
--- a/tests/auto/render/technique/tst_technique.cpp
+++ b/tests/auto/render/technique/tst_technique.cpp
@@ -349,7 +349,7 @@ private Q_SLOTS:
         simulateInitializationSync(filterKey5, backendFilterKey5);
 
         // THEN
-        QCOMPARE(nodeManagers.filterKeyManager()->activeHandles().size(), 5);
+        QCOMPARE(nodeManagers.filterKeyManager()->activeHandles().size(), size_t(5));
 
         {
             // WHEN
diff --git a/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp b/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp
index 7e5a114bb..006226a7b 100644
--- a/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp
+++ b/tests/auto/render/updateshaderdatatransformjob/tst_updateshaderdatatransformjob.cpp
@@ -139,7 +139,7 @@ struct NodeCollection
         : shaderData(frontendRoot->findChildren<Qt3DRender::QShaderData *>())
     {
         // THEN
-        QCOMPARE(aspect->nodeManagers()->shaderDataManager()->activeHandles().size(), shaderData.size());
+        QCOMPARE(aspect->nodeManagers()->shaderDataManager()->activeHandles().size(), size_t(shaderData.size()));
 
         for (const Qt3DRender::QShaderData *s : qAsConst(shaderData)) {
             Qt3DRender::Render::ShaderData *backend = aspect->nodeManagers()->shaderDataManager()->lookupResource(s->id());