From afea6963b2f19407e2d52984c75e794ab8a49852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronsolutions.com>
Date: Tue, 25 Feb 2020 17:05:49 +0100
Subject: [PATCH] Fix linux compile error and warnings

---
 .../Surfaces/RivSurfaceIntersectionGeometryGenerator.cpp        | 2 +-
 .../ModelVisualization/Surfaces/RivSurfacePartMgr.cpp           | 2 +-
 .../ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp          | 2 +-
 .../UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ApplicationCode/ModelVisualization/Surfaces/RivSurfaceIntersectionGeometryGenerator.cpp b/ApplicationCode/ModelVisualization/Surfaces/RivSurfaceIntersectionGeometryGenerator.cpp
index 2e8a743f4b..4465f10d37 100644
--- a/ApplicationCode/ModelVisualization/Surfaces/RivSurfaceIntersectionGeometryGenerator.cpp
+++ b/ApplicationCode/ModelVisualization/Surfaces/RivSurfaceIntersectionGeometryGenerator.cpp
@@ -182,7 +182,7 @@ void RivSurfaceIntersectionGeometryGenerator::calculateArrays()
         // End loop local memory
 
 #pragma omp for // default scheduling absolutely best
-        for ( int ntVxIdx = 0; ntVxIdx < nativeTriangleIndices.size(); ntVxIdx += 3 )
+        for ( int ntVxIdx = 0; ntVxIdx < static_cast<int>( nativeTriangleIndices.size() ); ntVxIdx += 3 )
         {
             cvf::Vec3d p0 = nativeVertices[nativeTriangleIndices[ntVxIdx + 0]];
             cvf::Vec3d p1 = nativeVertices[nativeTriangleIndices[ntVxIdx + 1]];
diff --git a/ApplicationCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp b/ApplicationCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp
index c41dbcc5e8..03ec55f743 100644
--- a/ApplicationCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp
@@ -450,7 +450,7 @@ void RivSurfacePartMgr::calculateVertexTextureCoordinates( cvf::Vec2fArray*
 {
     if ( !resultAccessor ) return;
 
-    size_t numVertices = vertexToCellIdxMap.size();
+    int numVertices = static_cast<int>( vertexToCellIdxMap.size() );
 
     textureCoords->resize( numVertices );
     cvf::Vec2f* rawPtr = textureCoords->ptr();
diff --git a/ApplicationCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp b/ApplicationCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
index 75f43c9a32..ed95e11c2e 100644
--- a/ApplicationCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
+++ b/ApplicationCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
@@ -707,7 +707,7 @@ void RimAnalysisPlot::addDataToChartBuilder( RiuGroupedBarChartBuilder& chartBui
 
         for ( time_t tt : selectedTimesteps )
         {
-            for ( int timestepIdx = 0; timestepIdx < timesteps.size(); ++timestepIdx )
+            for ( int timestepIdx = 0; static_cast<unsigned>( timestepIdx ) < timesteps.size(); ++timestepIdx )
             {
                 if ( timesteps[timestepIdx] == tt )
                 {
diff --git a/ApplicationCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp b/ApplicationCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp
index edf4251098..f5e876f860 100644
--- a/ApplicationCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp
+++ b/ApplicationCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp
@@ -138,7 +138,7 @@ public:
         }
         else
         {
-            return "X"; // Just for debugging
+            return QwtText( QString( "X" ) ); // Just for debugging
         }
     }