From 686aef821eb6508eb22eea469f367393e8e95fc2 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Sat, 16 Jul 2016 16:31:55 +0200 Subject: [PATCH] Cleaned up includes --- .../RivGeoMechVizLogic.cpp | 25 +++++++++++-------- .../RivCellEdgeGeometryUtils.cpp | 9 ++++--- .../RivReservoirFaultsPartMgr.cpp | 22 +++++++++------- .../RivReservoirFaultsPartMgr.h | 8 ++++-- .../RivReservoirPartMgr.cpp | 9 ++++--- .../ModelVisualization/RivReservoirPartMgr.h | 5 ++-- .../RivReservoirViewPartMgr.cpp | 19 +++++++------- .../RivReservoirViewPartMgr.h | 17 ++++++++++--- .../ProjectDataModel/RimFaultCollection.cpp | 7 +++++- .../UserInterface/RiuViewerCommands.cpp | 1 + 10 files changed, 77 insertions(+), 45 deletions(-) diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp b/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp index f15c8bb79d..72c32a601e 100644 --- a/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp +++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp @@ -19,23 +19,26 @@ #include "RivGeoMechVizLogic.h" -#include "RimGeoMechView.h" -#include "cvfModelBasicList.h" -#include "RimGeoMechCellColors.h" -#include "RivGeoMechPartMgrCache.h" -#include "RivGeoMechPartMgr.h" -#include "RivReservoirViewPartMgr.h" -#include "RimGeoMechCase.h" #include "RigFemPartCollection.h" +#include "RigFemPartResultsCollection.h" #include "RigGeoMechCaseData.h" + #include "RimCellRangeFilterCollection.h" +#include "RimGeoMechCase.h" +#include "RimGeoMechCellColors.h" +#include "RimGeoMechPropertyFilterCollection.h" +#include "RimGeoMechView.h" +#include "RimView.h" +#include "RimViewController.h" #include "RivCellSetEnum.h" #include "RivFemElmVisibilityCalculator.h" -#include "RigFemPartResultsCollection.h" -#include "RimGeoMechPropertyFilterCollection.h" -#include "RimView.h" -#include "RimViewController.h" +#include "RivGeoMechPartMgr.h" +#include "RivGeoMechPartMgrCache.h" +#include "RivReservoirViewPartMgr.h" + +#include "cvfModelBasicList.h" +#include "cvfStructGridGeometryGenerator.h" //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp index fef803b19e..cfbec0a65d 100644 --- a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp +++ b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp @@ -26,15 +26,18 @@ #include "RigGridBase.h" #include "RigResultAccessor.h" #include "RigResultAccessorFactory.h" -#include "RimEclipseCase.h" + #include "RimCellEdgeColors.h" -#include "RimEclipseView.h" +#include "RimEclipseCase.h" #include "RimEclipseCellColors.h" -#include "RimTernaryLegendConfig.h" +#include "RimEclipseView.h" #include "RimEclipseWellCollection.h" +#include "RimTernaryLegendConfig.h" + #include "RivTernaryTextureCoordsCreator.h" #include "cvfDrawableGeo.h" +#include "cvfScalarMapper.h" #include "cvfVertexAttribute.h" diff --git a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp index 390bf19d25..0aaa78e34c 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp @@ -19,20 +19,24 @@ #include "RivReservoirFaultsPartMgr.h" -#include "cvfPart.h" -#include "cvfModelBasicList.h" +#include "RigCaseData.h" +#include "RigMainGrid.h" + +#include "RimEclipseCase.h" +#include "RimEclipseCellColors.h" +#include "RimEclipseFaultColors.h" +#include "RimEclipseView.h" +#include "RimFaultCollection.h" + +#include "RivFaultPartMgr.h" + #include "cvfColor3.h" +#include "cvfModelBasicList.h" +#include "cvfPart.h" #include "cvfTransform.h" #include "cafPdmFieldCvfColor.h" -#include "RigMainGrid.h" -#include "RimFaultCollection.h" -#include "RimEclipseFaultColors.h" -#include "RimEclipseView.h" -#include "RimEclipseCellColors.h" -#include "RimEclipseCase.h" -#include "RigCaseData.h" //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h index 6ec47c92f6..9b88a6f656 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h @@ -19,20 +19,24 @@ #pragma once +#include "cvfArray.h" #include "cvfBase.h" +#include "cvfCollection.h" #include "cvfObject.h" -#include "RigGridBase.h" -#include "RivFaultPartMgr.h" +#include "cafPdmPointer.h" namespace cvf { class Transform; + class ModelBasicList; } class RimEclipseCellColors; class RimCellEdgeColors; class RimEclipseView; +class RivFaultPartMgr; +class RigMainGrid; //================================================================================================== /// diff --git a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp index a99d8c7218..fe0788240e 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp @@ -20,12 +20,13 @@ #include "RivReservoirPartMgr.h" +#include "RigCaseData.h" + +#include "RivGridPartMgr.h" +#include "RivReservoirFaultsPartMgr.h" + #include "cvfStructGrid.h" #include "cvfModelBasicList.h" - -#include "RigCaseData.h" -#include "RivGridPartMgr.h" - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h index 69cee52abd..f1297f25f0 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h @@ -24,9 +24,6 @@ #include "cvfArray.h" #include "cvfCollection.h" -#include "RivGridPartMgr.h" -#include "RivReservoirFaultsPartMgr.h" - namespace cvf { class ModelBasicList; @@ -37,6 +34,8 @@ class RimEclipseCellColors; class RimCellEdgeColors; class RigCaseData; class RimEclipseView; +class RivReservoirFaultsPartMgr; +class RivGridPartMgr; //================================================================================================== /// diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp index 7f90acc7cb..8790a909ba 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp @@ -22,25 +22,26 @@ #include "RigCaseCellResultsData.h" #include "RigCaseData.h" +#include "RigCaseToCaseCellMapper.h" #include "RigGridBase.h" #include "RigResultAccessorFactory.h" #include "Rim3dOverlayInfoConfig.h" -#include "RimEclipseCase.h" #include "RimCellEdgeColors.h" -#include "RimEclipsePropertyFilterCollection.h" #include "RimCellRangeFilterCollection.h" +#include "RimEclipseCase.h" +#include "RimEclipseCellColors.h" +#include "RimEclipsePropertyFilterCollection.h" +#include "RimEclipseResultDefinition.h" +#include "RimEclipseView.h" +#include "RimEclipseWellCollection.h" #include "RimFaultCollection.h" #include "RimReservoirCellResultsStorage.h" -#include "RimEclipseView.h" -#include "RimEclipseResultDefinition.h" -#include "RimEclipseCellColors.h" -#include "RimEclipseWellCollection.h" - -#include "RivGridPartMgr.h" #include "RimViewController.h" #include "RimViewLinker.h" -#include "RigCaseToCaseCellMapper.h" + +#include "RivGridPartMgr.h" +#include "RivReservoirFaultsPartMgr.h" //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h index 07d807bec2..a9547a85da 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h @@ -19,18 +19,29 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "RivReservoirPartMgr.h" -#include "cvfTransform.h" + +#include "RivCellSetEnum.h" +#include "RivReservoirPartMgr.h" // Must include here because of caf::FixedArray + #include "cafFixedArray.h" #include "cvfArray.h" +#include "cvfBase.h" +#include "cvfTransform.h" + #include "cafPdmObject.h" -#include "RivCellSetEnum.h" class RimEclipseView; class RigGridBase; class RimCellRangeFilterCollection; class RimEclipsePropertyFilterCollection; class RigActiveCellInfo; +class RimEclipseCellColors; +class RimCellEdgeColors; + +namespace cvf +{ + class ModelBasicList; +} class RivReservoirViewPartMgr: public cvf::Object { diff --git a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp index a4f4d41521..5e8f4f2333 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimFaultCollection.cpp @@ -21,12 +21,17 @@ #include "RiaApplication.h" #include "RiaPreferences.h" + #include "RigCaseData.h" + #include "RimEclipseCase.h" +#include "RimEclipseView.h" +#include "RimFault.h" #include "RimNoCommonAreaNNC.h" #include "RimNoCommonAreaNncCollection.h" -#include "RimEclipseView.h" + #include "RiuMainWindow.h" + #include "RivColorTableArray.h" #include "cafAppEnum.h" diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index 81e5fd5e94..85f7ba8ac6 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp @@ -39,6 +39,7 @@ #include "RimEclipseFaultColors.h" #include "RimEclipseView.h" #include "RimEclipseWell.h" +#include "RimFault.h" #include "RimFaultCollection.h" #include "RimGeoMechCase.h" #include "RimGeoMechCellColors.h"