From 9f87011ddd71eb6dfb8371b92fbc73238c046455 Mon Sep 17 00:00:00 2001
From: Jacob Storen <jacob.storen@ceetronSolutions.com>
Date: Wed, 3 Jun 2015 04:22:34 -0700
Subject: [PATCH] Linux compile fixes

---
 .../GeoMech/GeoMechDataModel/RigFemPartCollection.cpp       | 2 +-
 .../GeoMech/GeoMechDataModel/RigFemScalarResultFrames.h     | 1 +
 .../GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp         | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartCollection.cpp b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartCollection.cpp
index 242d505d68..b847cb4964 100644
--- a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartCollection.cpp
+++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartCollection.cpp
@@ -76,7 +76,7 @@ size_t RigFemPartCollection::totalElementCount() const
 {
     size_t elementCount = 0;
 
-    for (size_t i = 0; i < partCount(); i++)
+    for (int i = 0; i < partCount(); i++)
     {
         elementCount += part(i)->elementCount();
     }
diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemScalarResultFrames.h b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemScalarResultFrames.h
index 386cb4c858..a3736f359c 100644
--- a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemScalarResultFrames.h
+++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemScalarResultFrames.h
@@ -20,6 +20,7 @@
 #pragma once
 #include "cvfObject.h"
 #include <vector>
+#include <string>
 
 //==================================================================================================
 /// 
diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp b/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp
index 9faf32e849..2500135225 100644
--- a/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp
+++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigGeoMechCaseData.cpp
@@ -30,7 +30,7 @@
 #include <cmath>
 #include "cvfBoundingBox.h"
 #include "cafProgressInfo.h"
-#include "..\src\corelib\tools\qstring.h"
+#include <QString>
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -148,9 +148,9 @@ RigFemScalarResultFrames* RigGeoMechCaseData::findOrLoadScalarResult(int partInd
     std::vector<std::string> stepNames =  m_readerInterface->stepNames();
     frames = m_femPartResults[partIndex]->createScalarResult( resVarAddr);
 
-    for (int stepIndex = 0; stepIndex < stepNames.size(); ++stepIndex)
+    for (int stepIndex = 0; stepIndex < static_cast<int>(stepNames.size()); ++stepIndex)
     {
-    std::vector<double > frameTimes = m_readerInterface->frameTimes((int)stepIndex);
+    std::vector<double > frameTimes = m_readerInterface->frameTimes(stepIndex);
 
     for (int fIdx = 1; (size_t)fIdx < frameTimes.size() && fIdx < 2 ; ++fIdx)  // Read only the second frame
     {