#1068 Avoid include of RigMainGrid.h in RigCaseData.h

ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp

@@ -28,6 +28,7 @@
 #include "RigFemPartResultsCollection.h"
 #include "RigFemResultAddress.h"
 #include "RigGeoMechCaseData.h"
+#include "RigMainGrid.h"
 #include "RigStatisticsDataCache.h"
 
 #include "RimCellEdgeColors.h"

ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp

@@ -25,7 +25,7 @@
 #include "RigFemPartCollection.h"
 #include "RigFemPartGrid.h"
 #include "RigGeoMechCaseData.h"
-#include "RigGridBase.h"
+#include "RigMainGrid.h"
 
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"

ApplicationCode/ProjectDataModel/RimEclipseCase.cpp

@@ -25,6 +25,7 @@
 
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigMainGrid.h"
 
 #include "RimCaseCollection.h"
 #include "RimCellEdgeColors.h"

ApplicationCode/ProjectDataModel/RimEclipseCaseCollection.cpp

@@ -21,13 +21,16 @@
 #include "RimEclipseCaseCollection.h"
 
 #include "RiaApplication.h"
+
 #include "RigCaseData.h"
 #include "RigGridManager.h"
-#include "RimEclipseCase.h"
+#include "RigMainGrid.h"
+
 #include "RimCaseCollection.h"
+#include "RimEclipseCase.h"
+#include "RimEclipseStatisticsCase.h"
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimProject.h"
-#include "RimEclipseStatisticsCase.h"
 
 
 CAF_PDM_SOURCE_INIT(RimEclipseCaseCollection, "ResInsightAnalysisModels");

ApplicationCode/ProjectDataModel/RimEclipseInputCaseOpm.cpp

@@ -26,6 +26,7 @@
 
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigMainGrid.h"
 
 #include "RimEclipseCase.h"
 #include "RimEclipseInputProperty.h"

ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseEvaluator.cpp

@@ -22,6 +22,7 @@
 
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigMainGrid.h"
 #include "RigResultAccessorFactory.h"
 #include "RigResultModifier.h"
 #include "RigResultModifierFactory.h"

ApplicationCode/ProjectDataModel/RimEclipseView.cpp

@@ -25,23 +25,27 @@
 
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigFlowDiagResults.h"
 #include "RigFormationNames.h"
+#include "RigMainGrid.h"
 #include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"
 
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimCellEdgeColors.h"
 #include "RimCellRangeFilterCollection.h"
-#include "RimIntersection.h"
-#include "RimIntersectionCollection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseFaultColors.h"
 #include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseResultDefinition.h"
 #include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
 #include "RimFaultCollection.h"
+#include "RimFlowDiagSolution.h"
 #include "RimGridCollection.h"
+#include "RimIntersection.h"
+#include "RimIntersectionCollection.h"
 #include "RimLegendConfig.h"
 #include "RimOilField.h"
 #include "RimProject.h"
@@ -76,9 +80,6 @@
 #include <QMessageBox>
 
 #include <limits.h>
-#include "RimEclipseResultDefinition.h"
-#include "RimFlowDiagSolution.h"
-#include "RigFlowDiagResults.h"
 
 
 

ApplicationCode/ProjectDataModel/RimFaultCollection.cpp

@@ -23,6 +23,7 @@
 #include "RiaPreferences.h"
 
 #include "RigCaseData.h"
+#include "RigMainGrid.h"
 
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"

ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp

@@ -17,11 +17,13 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RimFlowDiagSolution.h"
-#include "RimEclipseResultCase.h"
-#include "RigCaseData.h"
 
-#include "RigFlowDiagResults.h"
+#include "RimEclipseResultCase.h"
+
 #include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
+#include "RigFlowDiagResults.h"
+#include "RigMainGrid.h"
 
 CAF_PDM_SOURCE_INIT(RimFlowDiagSolution, "FlowDiagSolution");
 

ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp

@@ -22,22 +22,26 @@
 
 #include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
+#include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
 #include "RigGridManager.h"
-#include "RimEclipseCase.h"
+#include "RigMainGrid.h"
+
 #include "RimCaseCollection.h"
 #include "RimCellEdgeColors.h"
-#include "RimReservoirCellResultsStorage.h"
-#include "RimEclipseView.h"
-#include "RimEclipseResultCase.h"
+#include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
+#include "RimEclipseResultCase.h"
 #include "RimEclipseStatisticsCase.h"
-#include "RigCaseCellResultsData.h"
+#include "RimEclipseView.h"
+#include "RimReservoirCellResultsStorage.h"
+
+#include "RiuMainWindow.h"
 
 #include "cafProgressInfo.h"
-#include "RiuMainWindow.h"
-#include <QMessageBox>
+
 #include <QDir>
+#include <QMessageBox>
 
 CAF_PDM_SOURCE_INIT(RimIdenticalGridCaseGroup, "RimIdenticalGridCaseGroup");
 

ApplicationCode/ProjectDataModel/RimViewController.cpp

@@ -21,11 +21,12 @@
 
 #include "RiaApplication.h"
 
-//#include "RigCaseData.h"
+#include "RigCaseData.h"
 #include "RigCaseToCaseCellMapper.h"
 #include "RigCaseToCaseRangeFilterMapper.h"
 #include "RigFemPartCollection.h"
 #include "RigGeoMechCaseData.h"
+#include "RigMainGrid.h"
 
 #include "RimCase.h"
 #include "RimCellRangeFilterCollection.h"