#1068 Removed obsolete include of RigCaseData

ApplicationCode/Commands/EclipseCommands/RicSaveEclipseResultAsInputPropertyExec.cpp

@@ -24,7 +24,6 @@
 #include "RimEclipseView.h"
 #include "RimEclipseCase.h"
 
-#include "RigCaseData.h"
 #include "RigCaseCellResultsData.h"
 
 #include "RifEclipseInputFileTools.h"

ApplicationCode/FileInterface/RifReaderMockModel.cpp

@@ -19,9 +19,12 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RifReaderMockModel.h"
-#include "RigCaseCellResultsData.h"
+
 #include "RifReaderInterface.h"
 
+#include "RigCaseCellResultsData.h"
+#include "RigCaseData.h"
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp

@@ -22,7 +22,6 @@
 #include "RimCellRangeFilter.h"
 
 #include "RigActiveCellInfo.h"
-#include "RigCaseData.h"
 #include "RigGridBase.h"
 #include "RigMainGrid.h"
 

ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp

@@ -20,7 +20,6 @@
 
 #include "RimCellRangeFilterCollection.h"
 
-#include "RigCaseData.h"
 #include "RigFemPart.h"
 #include "RigFemPartCollection.h"
 #include "RigFemPartGrid.h"

ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp

@@ -19,9 +19,6 @@
 
 #include "RimEclipseFaultColors.h"
 
-#include "RigCaseData.h"
-#include "RigMainGrid.h"
-
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"

ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp

@@ -31,6 +31,7 @@
 #include "RigActiveCellInfo.h"
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigMainGrid.h"
 
 #include "RimDefines.h"
 #include "RimEclipseInputProperty.h"

ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp

@@ -29,6 +29,7 @@
 
 #include "RigCaseCellResultsData.h"
 #include "RigCaseData.h"
+#include "RigMainGrid.h"
 
 #include "RimMockModelSettings.h"
 #include "RimProject.h"

ApplicationCode/ProjectDataModel/RimFaultCollection.cpp

@@ -22,7 +22,6 @@
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
 
-#include "RigCaseData.h"
 #include "RigMainGrid.h"
 
 #include "RimEclipseCase.h"

ApplicationCode/ProjectDataModel/RimView.cpp

@@ -3,8 +3,6 @@
 #include "RiaApplication.h"
 #include "RiaPreferences.h"
 
-#include "RigCaseData.h"
-
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipseCase.h"

ApplicationCode/ProjectDataModel/RimViewController.cpp

@@ -21,7 +21,6 @@
 
 #include "RiaApplication.h"
 
-#include "RigCaseData.h"
 #include "RigCaseToCaseCellMapper.h"
 #include "RigCaseToCaseRangeFilterMapper.h"
 #include "RigFemPartCollection.h"
@@ -857,7 +856,7 @@ bool RimViewController::isRangeFilterMappingApliccable() const
     {
         if (eclipseView->eclipseCase()->reservoirData() && geomView->geoMechCase() && geomView->geoMechCase()->geoMechData())
         {
-            RigMainGrid* eclGrid = eclipseView->eclipseCase()->reservoirData()->mainGrid();
+            RigMainGrid* eclGrid = eclipseView->mainGrid();
             RigFemPart* femPart = geomView->geoMechCase()->geoMechData()->femParts()->part(0);
 
             if (eclGrid && femPart)

ApplicationCode/ProjectDataModel/RimWellLogPlotCollection.cpp

@@ -19,7 +19,6 @@
 
 #include "RimWellLogPlotCollection.h"
 
-#include "RigCaseData.h"
 #include "RigEclipseWellLogExtractor.h"
 #include "RigGeoMechCaseData.h"
 #include "RigGeoMechWellLogExtractor.h"

ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp

@@ -22,6 +22,8 @@
 
 #include "RigActiveCellInfo.h"
 #include "RigCaseData.h"
+#include "RigCell.h"
+#include "RigMainGrid.h"
 #include "RigSingleWellResultsData.h"
 
 /* rand example: guess the number */

ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h

@@ -24,9 +24,18 @@
 #include "cvfObject.h"
 #include "cvfArray.h"
 #include "cvfVector3.h"
-#include "RigCell.h"
+
-#include "RigCaseData.h"
+//#include "RigCell.h"
-#include "RigMainGrid.h"
+//#include "RigCaseData.h"
+//#include "RigMainGrid.h"
+
+class RigCaseData;
+class RigMainGrid;
+class RigConnection;
+class RigGridBase;
+class RigCell;
+
+class QString;
 
 class LocalGridRefinement
 {

ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp

@@ -19,29 +19,29 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RiaSocketCommand.h"
+
+#include "RiaApplication.h"
 #include "RiaSocketServer.h"
 #include "RiaSocketTools.h"
 
-#include "RimEclipseView.h"
+#include "Rim3dOverlayInfoConfig.h"
-#include "RimEclipseCellColors.h"
+#include "RimCaseCollection.h"
 #include "RimCellEdgeColors.h"
 #include "RimCellRangeFilterCollection.h"
-#include "RimEclipsePropertyFilterCollection.h"
-#include "RimEclipseWellCollection.h"
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimReservoirCellResultsStorage.h"
-
 #include "RimEclipseCase.h"
-#include "RigCaseData.h"
-#include "RigCaseCellResultsData.h"
-#include "RiuMainWindow.h"
-#include "RiaApplication.h"
-#include "RimProject.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimCaseCollection.h"
-#include "RimScriptCollection.h"
-#include "RimOilField.h"
 #include "RimEclipseCaseCollection.h"
+#include "RimEclipseCellColors.h"
+#include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseView.h"
+#include "RimEclipseWellCollection.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimOilField.h"
+#include "RimProject.h"
+#include "RimReservoirCellResultsStorage.h"
+#include "RimScriptCollection.h"
+
+#include "RiuMainWindow.h"
+
 #include "cafSelectionManager.h"
 
 

ApplicationCode/SocketInterface/RiaSocketServer.cpp

@@ -20,29 +20,13 @@
 
 #include "RiaSocketServer.h"
 #include "RiaSocketCommand.h"
-#include "RiaSocketTools.h"
 
 #include "RiaApplication.h"
 
-#include "RigCaseCellResultsData.h"
-#include "RigCaseData.h"
-#include "RigGridBase.h"
-
-#include "Rim3dOverlayInfoConfig.h"
-#include "RimCaseCollection.h"
-#include "RimCellEdgeColors.h"
-#include "RimCellRangeFilterCollection.h"
 #include "RimEclipseCase.h"
-#include "RimEclipseCaseCollection.h"
-#include "RimEclipseCellColors.h"
-#include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
-#include "RimIdenticalGridCaseGroup.h"
-#include "RimOilField.h"
 #include "RimProject.h"
-#include "RimReservoirCellResultsStorage.h"
+#include "RimCase.h"
-#include "RimScriptCollection.h"
 
 #include "RiuMainWindow.h"
 #include "RiuViewer.h"