Fix a number of MSVC int conversion warnings

- Port the qHash() functions to size_t
- Add some casts
- Adapt some types

Pick-to: 6.0
Change-Id: Ib889d46dd56c1a1c4bf6b87ae1f756c188069180
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

10 files changed, 21 insertions, 21 deletions

diff --git a/src/plugins/renderers/opengl/debug/imguirenderer.cpp b/src/plugins/renderers/opengl/debug/imguirenderer.cpp
index de8cf0a09..744060fcf 100644
--- a/src/plugins/renderers/opengl/debug/imguirenderer.cpp
+++ b/src/plugins/renderers/opengl/debug/imguirenderer.cpp
@@ -171,7 +171,7 @@ void ImGuiRenderer::renderDebugOverlay(const std::vector<RenderView *> &renderVi
     if (!newFrame(renderView))
         return;
 
-    const int renderViewsCount = renderViews.size();
+    const int renderViewsCount = int(renderViews.size());
 
     int logIndex = qMin(IMGUI_PERF_LOG_SIZE - 1, ImGui::GetFrameCount());
     if (logIndex == IMGUI_PERF_LOG_SIZE - 1) {
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicscontext.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicscontext.cpp
index ad6fde8bb..287dfffe5 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicscontext.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicscontext.cpp
@@ -350,7 +350,7 @@ void GraphicsContext::activateDrawBuffers(const AttachmentPack &attachments)
         if (activeDrawBuffers.size() > 1) {// We need MRT
             if (m_glHelper->supportsFeature(GraphicsHelperInterface::MRT)) {
                 // Set up MRT, glDrawBuffers...
-                m_glHelper->drawBuffers(activeDrawBuffers.size(), activeDrawBuffers.data());
+                m_glHelper->drawBuffers(GLsizei(activeDrawBuffers.size()), activeDrawBuffers.data());
             }
         }
     } else {
diff --git a/src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp b/src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp
index c2316d81a..f641d6641 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp
@@ -255,7 +255,7 @@ int ImageSubmissionContext::activateImage(ShaderImage *image, GLTexture *tex)
 // Unset pinned Active Image and reduce their score
 void ImageSubmissionContext::deactivateImages()
 {
-    for (int u = 0, m = m_activeImages.size();  u < m; ++u) {
+    for (size_t u = 0, m = m_activeImages.size();  u < m; ++u) {
         if (m_activeImages[u].pinned) {
             m_activeImages[u].pinned = false;
             m_activeImages[u].score = qMax(m_activeImages[u].score - 1, 0);
@@ -267,7 +267,7 @@ void ImageSubmissionContext::deactivateImages()
 // Reduce score of all active images (pinned or not)
 void ImageSubmissionContext::decayImageScores()
 {
-    for (int u = 0, m = m_activeImages.size();  u < m; ++u)
+    for (size_t u = 0, m = m_activeImages.size();  u < m; ++u)
         m_activeImages[u].score = qMax(m_activeImages[u].score - 1, 0);
 }
 
@@ -276,13 +276,13 @@ int ImageSubmissionContext::assignUnitForImage(Qt3DCore::QNodeId shaderImageId)
     int lowestScoredUnit = -1;
     int lowestScore = 0xfffffff;
 
-    const int m = m_activeImages.size();
-    for (int u = 0; u < m; ++u) {
+    const size_t m = m_activeImages.size();
+    for (size_t u = 0; u < m; ++u) {
         if (m_activeImages[u].shaderImageId == shaderImageId)
-            return u;
+            return int(u);
     }
 
-    for (int u = 0; u < m; ++u) {
+    for (size_t u = 0; u < m; ++u) {
         // No image is currently active on the image unit
         // we save the image unit with the texture that has been on there
         // the longest time while not being used
@@ -290,7 +290,7 @@ int ImageSubmissionContext::assignUnitForImage(Qt3DCore::QNodeId shaderImageId)
             const int score = m_activeImages[u].score;
             if (score < lowestScore) {
                 lowestScore = score;
-                lowestScoredUnit = u;
+                lowestScoredUnit = int(u);
             }
         }
     }
diff --git a/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp b/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp
index e3542c98a..0ef8f31c3 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp
@@ -890,7 +890,7 @@ void SubmissionContext::activateDrawBuffers(const AttachmentPack &attachments)
         if (activeDrawBuffers.size() > 1) {// We need MRT
             if (m_glHelper->supportsFeature(GraphicsHelperInterface::MRT)) {
                 // Set up MRT, glDrawBuffers...
-                m_glHelper->drawBuffers(activeDrawBuffers.size(), activeDrawBuffers.data());
+                m_glHelper->drawBuffers(GLsizei(activeDrawBuffers.size()), activeDrawBuffers.data());
             }
         }
     } else {
diff --git a/src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext.cpp b/src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext.cpp
index f997dfeeb..1650f8563 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/texturesubmissioncontext.cpp
@@ -193,7 +193,7 @@ int TextureSubmissionContext::assignUnitForTexture(GLTexture *tex)
 
     for (size_t u=0; u<m_activeTextures.size(); ++u) {
         if (m_activeTextures[u].texture == tex)
-            return u;
+            return int(u);
     }
 
     for (size_t u=0; u<m_activeTextures.size(); ++u) {
@@ -204,7 +204,7 @@ int TextureSubmissionContext::assignUnitForTexture(GLTexture *tex)
             int score = m_activeTextures[u].score;
             if (score < lowestScore) {
                 lowestScore = score;
-                lowestScoredUnit = u;
+                lowestScoredUnit = int(u);
             }
         }
     } // of units iteration
diff --git a/src/plugins/renderers/opengl/renderer/commandexecuter.cpp b/src/plugins/renderers/opengl/renderer/commandexecuter.cpp
index 64878c926..beb032935 100644
--- a/src/plugins/renderers/opengl/renderer/commandexecuter.cpp
+++ b/src/plugins/renderers/opengl/renderer/commandexecuter.cpp
@@ -178,7 +178,7 @@ QJsonObject parameterPackToJson(const Render::OpenGL::ShaderParameterPack &pack)
 
     const Render::OpenGL::PackUniformHash &uniforms = pack.uniforms();
     QJsonArray uniformsArray;
-    for (int i = 0, m = uniforms.keys.size(); i < m; ++i) {
+    for (qsizetype i = 0, m = uniforms.keys.size(); i < m; ++i) {
         QJsonObject uniformObj;
         uniformObj.insert(QLatin1String("name"), Render::StringToInt::lookupString(uniforms.keys.at(i)));
         const Render::UniformValue::ValueType type = uniforms.values.at(i).valueType();
diff --git a/src/plugins/renderers/opengl/renderer/renderer.cpp b/src/plugins/renderers/opengl/renderer/renderer.cpp
index 085556a88..4fcf35496 100644
--- a/src/plugins/renderers/opengl/renderer/renderer.cpp
+++ b/src/plugins/renderers/opengl/renderer/renderer.cpp
@@ -1866,7 +1866,7 @@ std::vector<Qt3DCore::QAspectJobPtr> Renderer::renderBinJobs()
 
     const size_t fgBranchCount = m_frameGraphLeaves.size();
     if (fgBranchCount > 1) {
-        int workBranches = fgBranchCount;
+        int workBranches = int(fgBranchCount);
         for (auto leaf: m_frameGraphLeaves)
             if (leaf->nodeType() == FrameGraphNode::NoDraw)
                 --workBranches;
@@ -1877,7 +1877,7 @@ std::vector<Qt3DCore::QAspectJobPtr> Renderer::renderBinJobs()
 
     for (size_t i = 0; i < fgBranchCount; ++i) {
         FrameGraphNode *leaf = m_frameGraphLeaves[i];
-        RenderViewBuilder builder(leaf, i, this);
+        RenderViewBuilder builder(leaf, int(i), this);
         builder.setOptimalJobCount(leaf->nodeType() == FrameGraphNode::NoDraw ? 1 : idealThreadCount);
 
         // If we have a new RV (wasn't in the cache before, then it contains no cached data)
@@ -1896,7 +1896,7 @@ std::vector<Qt3DCore::QAspectJobPtr> Renderer::renderBinJobs()
     }
 
     // Set target number of RenderViews
-    m_renderQueue.setTargetRenderViewCount(fgBranchCount);
+    m_renderQueue.setTargetRenderViewCount(int(fgBranchCount));
 
     if (isRunning() && m_submissionContext->isInitialized()) {
         if (dirtyBitsForFrame & AbstractRenderer::TechniquesDirty )
diff --git a/src/plugins/renderers/opengl/renderer/renderview.cpp b/src/plugins/renderers/opengl/renderer/renderview.cpp
index d456151e3..53c48281b 100644
--- a/src/plugins/renderers/opengl/renderer/renderview.cpp
+++ b/src/plugins/renderers/opengl/renderer/renderview.cpp
@@ -569,7 +569,7 @@ int advanceUntilNonAdjacent(const EntityRenderCommandDataView *view,
             ++i;
         }
     }
-    return i;
+    return int(i);
 }
 
 
@@ -772,7 +772,7 @@ void RenderView::sort()
     assert(m_renderCommandDataView);
     // Compares the bitsetKey of the RenderCommands
     // Key[Depth | StateCost | Shader]
-    sortCommandRange(m_renderCommandDataView.data(), 0, m_renderCommandDataView->size(), 0, m_sortingTypes);
+    sortCommandRange(m_renderCommandDataView.data(), 0, int(m_renderCommandDataView->size()), 0, m_sortingTypes);
 
     // For RenderCommand with the same shader
     // We compute the adjacent change cost
@@ -815,7 +815,7 @@ void RenderView::sort()
                     const UniformValue &refValue = cachedUniforms.value(uniformNameId);
                     const UniformValue &newValue = uniforms.values.at(u);
                     if (newValue == refValue) {
-                        uniforms.erase(u);
+                        uniforms.erase(int(u));
                     } else {
                         // Record updated value so that subsequent comparison
                         // for the next command will be made againts latest
diff --git a/src/plugins/renderers/opengl/renderer/renderview_p.h b/src/plugins/renderers/opengl/renderer/renderview_p.h
index 7914b1989..d67a04b8c 100644
--- a/src/plugins/renderers/opengl/renderer/renderview_p.h
+++ b/src/plugins/renderers/opengl/renderer/renderview_p.h
@@ -286,7 +286,7 @@ public:
         m_renderCommandDataView->forEachCommand(func);
     }
 
-    inline int commandCount() const { return m_renderCommandDataView ? m_renderCommandDataView->size() : 0; }
+    inline int commandCount() const { return m_renderCommandDataView ? int(m_renderCommandDataView->size()) : 0; }
 
 private:
     void setShaderAndUniforms(RenderCommand *command,
diff --git a/src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp b/src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp
index a3d8c4b61..6eaaaa84a 100644
--- a/src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp
+++ b/src/plugins/renderers/opengl/renderer/shaderparameterpack.cpp
@@ -84,7 +84,7 @@ void ShaderParameterPack::setTexture(const int glslNameId, int uniformArrayIndex
 
 void ShaderParameterPack::setImage(const int glslNameId, int uniformArrayIndex, Qt3DCore::QNodeId id)
 {
-    for (int i=0, m = m_images.size(); i < m; ++i) {
+    for (qsizetype i=0, m = m_images.size(); i < m; ++i) {
         if (m_images[i].glslNameId != glslNameId || m_images[i].uniformArrayIndex != uniformArrayIndex)
             continue;