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

ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp

@@ -21,6 +21,8 @@
 #include "RifEclipseInputFileTools.h"
 
 #include "RifReaderEclipseOutput.h"
+
+#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
 #include "RigMainGrid.h"

ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp

@@ -20,6 +20,7 @@
 
 #include "RifReaderEclipseOutput.h"
 
+#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
 #include "RigMainGrid.h"

ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp

@@ -20,6 +20,7 @@
 
 #include "RivReservoirViewPartMgr.h"
 
+#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
 #include "RigCaseToCaseCellMapper.h"

ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp

@@ -24,6 +24,7 @@
 
 #include "RiaApplication.h"
 
+#include "RigActiveCellInfo.h"
 #include "RigCaseData.h"
 #include "RigCell.h"
 #include "RigMainGrid.h"

ApplicationCode/ProjectDataModel/RimEclipseCase.cpp

@@ -23,6 +23,7 @@
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
 
+#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
 #include "RigMainGrid.h"

ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp

@@ -28,10 +28,11 @@
 #include "RifReaderMockModel.h"
 #include "RifReaderSettings.h"
 
+#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
-#include "RimDefines.h"
 
+#include "RimDefines.h"
 #include "RimEclipseInputProperty.h"
 #include "RimEclipseInputPropertyCollection.h"
 #include "RimReservoirCellResultsStorage.h"

ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp

@@ -20,6 +20,7 @@
 
 #include "RimEclipseResultDefinition.h"
 
+#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
 

ApplicationCode/ProjectDataModel/RimEclipseView.cpp

@@ -23,6 +23,7 @@
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
 
+#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
 #include "RigFlowDiagResults.h"

ApplicationCode/ProjectDataModel/RimFlowDiagSolution.cpp

@@ -20,6 +20,7 @@
 
 #include "RimEclipseResultCase.h"
 
+#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
 #include "RigFlowDiagResults.h"

ApplicationCode/ReservoirDataModel/RigCaseData.cpp

@@ -20,6 +20,7 @@
 
 #include "RigCaseData.h"
 
+#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigFormationNames.h"
 #include "RigMainGrid.h"

ApplicationCode/ReservoirDataModel/RigCaseData.h

@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "RigActiveCellInfo.h"
+//#include "RigActiveCellInfo.h"
 #include "RigCell.h"
 #include "RigSingleWellResultsData.h"
 

ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp

@@ -17,13 +17,16 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RigFlowDiagResults.h"
-#include "RigFlowDiagSolverInterface.h"
+
-#include "RimFlowDiagSolution.h"
+#include "RigActiveCellInfo.h"
-#include "RimEclipseResultCase.h"
-#include "RimEclipseCase.h"
 #include "RigCaseData.h"
+#include "RigFlowDiagSolverInterface.h"
 #include "RigFlowDiagStatCalc.h"
 
+#include "RimEclipseCase.h"
+#include "RimEclipseResultCase.h"
+#include "RimFlowDiagSolution.h"
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.cpp

@@ -17,15 +17,19 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RigFlowDiagSolverInterface.h"
-#include "RimFlowDiagSolution.h"
-#include "RimEclipseResultCase.h"
-#include "RigCaseCellResultsData.h"
 
-#include "RigFlowDiagInterfaceTools.h"
 #include "RifEclipseOutputFileTools.h"
-#include "RigCaseData.h"
-#include "RimEclipseCase.h"
 #include "RifReaderInterface.h"
+
+#include "RigActiveCellInfo.h"
+#include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
+#include "RigFlowDiagInterfaceTools.h"
+
+#include "RimEclipseCase.h"
+#include "RimEclipseResultCase.h"
+#include "RimFlowDiagSolution.h"
+
 #include <QMessageBox>
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp

@@ -25,6 +25,7 @@
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
 
+#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
 #include "RigMainGrid.h"

ApplicationCode/SocketInterface/RiaGeometryCommands.cpp

@@ -25,6 +25,7 @@
 #include "RiaSocketServer.h"
 #include "RiaSocketTools.h"
 
+#include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
 #include "RigMainGrid.h"