From fef0a2b70ce1c1f59bda49a3ea7de25c6411a00d Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 6 Jan 2022 08:39:22 +0100 Subject: [PATCH] Janitor : Remove obsolete includes in header files --- .../RivContourMapProjectionPartMgr.cpp | 1 + .../GeoMech/RimGeoMechContourMapProjection.cpp | 1 + .../GeoMech/RimGeoMechContourMapProjection.h | 1 - .../Intersections/RimIntersectionCollection.cpp | 2 ++ .../ProjectDataModel/RimContourMapProjection.h | 2 +- .../ProjectDataModel/RimEclipseContourMapProjection.h | 1 - .../ProjectDataModel/RimEclipseResultDefinition.cpp | 1 + .../ProjectDataModel/RimElementVectorResult.cpp | 2 ++ .../ProjectDataModel/RimElementVectorResult.h | 6 +++--- ApplicationLibCode/ProjectDataModel/RimTensorResults.cpp | 1 + ApplicationLibCode/ProjectDataModel/RimTensorResults.h | 9 +++++---- .../ProjectDataModel/RimTernaryLegendConfig.cpp | 1 + .../ProjectDataModel/Summary/RimEnsembleCurveSet.h | 1 - .../ProjectDataModel/WellLog/RimWellLogRftCurve.cpp | 1 + .../ProjectDataModel/WellLog/RimWellLogTrack.h | 1 - .../UserInterface/RiuScalarMapperLegendFrame.h | 1 - 16 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ApplicationLibCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp b/ApplicationLibCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp index 7077117ce4..33fa5efd27 100644 --- a/ApplicationLibCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp +++ b/ApplicationLibCode/ModelVisualization/RivContourMapProjectionPartMgr.cpp @@ -10,6 +10,7 @@ #include "RimContourMapProjection.h" #include "RimGridView.h" +#include "RimRegularLegendConfig.h" #include "cafCategoryMapper.h" #include "cafEffectGenerator.h" diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.cpp index 72e7f6ed59..00d991b36f 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.cpp @@ -34,6 +34,7 @@ #include "RimGeoMechCellColors.h" #include "RimGeoMechContourMapView.h" #include "RimGeoMechPropertyFilterCollection.h" +#include "RimRegularLegendConfig.h" #include "RivFemElmVisibilityCalculator.h" diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.h b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.h index 1b1ec697af..706d0200ad 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.h +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.h @@ -24,7 +24,6 @@ #include "RimCheckableNamedObject.h" #include "RimContourMapProjection.h" #include "RimGeoMechCase.h" -#include "RimRegularLegendConfig.h" #include "cafDisplayCoordTransform.h" #include "cafPdmChildField.h" diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp index c56728c5e7..7ec149ace0 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp @@ -29,6 +29,8 @@ #include "RimEclipseView.h" #include "RimExtrudedCurveIntersection.h" #include "RimGridView.h" +#include "RimIntersectionResultDefinition.h" +#include "RimIntersectionResultsDefinitionCollection.h" #include "RimSimWellInView.h" #include "Riu3DMainWindowTools.h" diff --git a/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.h b/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.h index 383af027a0..ae08b77e8f 100644 --- a/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.h +++ b/ApplicationLibCode/ProjectDataModel/RimContourMapProjection.h @@ -19,7 +19,6 @@ #pragma once #include "RimCheckableNamedObject.h" -#include "RimRegularLegendConfig.h" #include "cafContourLines.h" #include "cafDisplayCoordTransform.h" @@ -35,6 +34,7 @@ #include "cvfVector2.h" class RimGridView; +class RimRegularLegendConfig; //================================================================================================== /// diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.h b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.h index 9bbedbbca8..8cb131ed85 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.h +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapProjection.h @@ -20,7 +20,6 @@ #include "RimCheckableNamedObject.h" #include "RimContourMapProjection.h" -#include "RimRegularLegendConfig.h" #include "cafDisplayCoordTransform.h" #include "cafPdmChildField.h" diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 7e60133811..de74d7cf52 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -61,6 +61,7 @@ #include "RimIntersectionResultDefinition.h" #include "RimPlotCurve.h" #include "RimProject.h" +#include "RimRegularLegendConfig.h" #include "RimReservoirCellResultsStorage.h" #include "RimSimWellInView.h" #include "RimSimWellInViewCollection.h" diff --git a/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.cpp b/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.cpp index 9d30124f44..3a8abd3d20 100644 --- a/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.cpp @@ -15,6 +15,7 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// + #include "RimElementVectorResult.h" #include "RigCaseCellResultsData.h" @@ -26,6 +27,7 @@ #include "Rim3dView.h" #include "RimEclipseCase.h" #include "RimEclipseView.h" +#include "RimRegularLegendConfig.h" #include "RiuViewer.h" diff --git a/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.h b/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.h index 024a347354..ecdaaeef63 100644 --- a/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.h +++ b/ApplicationLibCode/ProjectDataModel/RimElementVectorResult.h @@ -18,6 +18,8 @@ #pragma once +#include "RimLegendConfig.h" + #include "cafPdmChildField.h" #include "cafPdmField.h" #include "cafPdmFieldCvfColor.h" // Include to make Pdm work for cvf::Color @@ -25,8 +27,6 @@ #include "RigEclipseResultAddress.h" -#include "RimRegularLegendConfig.h" - #include #include @@ -112,6 +112,6 @@ private: caf::PdmField> m_vectorColor; caf::PdmField m_uniformVectorColor; caf::PdmField m_sizeScale; - caf::PdmField m_rangeMode; + caf::PdmField m_rangeMode; caf::PdmChildField m_legendConfig; }; diff --git a/ApplicationLibCode/ProjectDataModel/RimTensorResults.cpp b/ApplicationLibCode/ProjectDataModel/RimTensorResults.cpp index 8acc6dcc49..0dbb989ac6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimTensorResults.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimTensorResults.cpp @@ -22,6 +22,7 @@ #include "RimGeoMechCase.h" #include "RimGeoMechResultDefinition.h" #include "RimGeoMechView.h" +#include "RimRegularLegendConfig.h" #include "RigFemPartResultsCollection.h" #include "RigGeoMechCaseData.h" diff --git a/ApplicationLibCode/ProjectDataModel/RimTensorResults.h b/ApplicationLibCode/ProjectDataModel/RimTensorResults.h index 8010b8f8c2..321c084c64 100644 --- a/ApplicationLibCode/ProjectDataModel/RimTensorResults.h +++ b/ApplicationLibCode/ProjectDataModel/RimTensorResults.h @@ -18,13 +18,14 @@ #pragma once +#include "RimLegendConfig.h" + #include "cafPdmChildField.h" #include "cafPdmField.h" #include "cafPdmObject.h" #include "RigFemResultPosEnum.h" #include "RimFemResultObserver.h" -#include "RimRegularLegendConfig.h" #include @@ -110,7 +111,7 @@ private: caf::PdmField> m_vectorColor; - caf::PdmField> m_scaleMethod; - caf::PdmField m_sizeScale; - caf::PdmField m_rangeMode; + caf::PdmField> m_scaleMethod; + caf::PdmField m_sizeScale; + caf::PdmField m_rangeMode; }; diff --git a/ApplicationLibCode/ProjectDataModel/RimTernaryLegendConfig.cpp b/ApplicationLibCode/ProjectDataModel/RimTernaryLegendConfig.cpp index 7411242a82..9c05d725fe 100644 --- a/ApplicationLibCode/ProjectDataModel/RimTernaryLegendConfig.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimTernaryLegendConfig.cpp @@ -22,6 +22,7 @@ #include "RiaApplication.h" #include "RiaColorTables.h" #include "RiaPreferences.h" +#include "RiaResultNames.h" #include "RimEclipseView.h" #include "RimIntersectionCollection.h" diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h index 10d35df05f..35f1ef8878 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h @@ -28,7 +28,6 @@ #include "RimEnsembleCurveSetColorManager.h" #include "RimEnsembleCurveSetInterface.h" #include "RimObjectiveFunction.h" -#include "RimRegularLegendConfig.h" #include "RimSummaryCase.h" #include "RimSummaryCaseCollection.h" #include "RimTimeStepFilter.h" diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp index a06e53a450..c41c0f0cf4 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp @@ -21,6 +21,7 @@ #include "RiaDefines.h" #include "RiaEclipseUnitTools.h" #include "RiaQDateTimeTools.h" +#include "RiaResultNames.h" #include "RiaSimWellBranchTools.h" #include "RifEclipseRftAddress.h" diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h index b3a9ce9159..259de526f9 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.h @@ -25,7 +25,6 @@ #include "RiuPlotAnnotationTool.h" #include "RimPlot.h" -#include "RimRegularLegendConfig.h" #include "cafPdmChildArrayField.h" #include "cafPdmField.h" diff --git a/ApplicationLibCode/UserInterface/RiuScalarMapperLegendFrame.h b/ApplicationLibCode/UserInterface/RiuScalarMapperLegendFrame.h index a2737b7003..af3ed2d5da 100644 --- a/ApplicationLibCode/UserInterface/RiuScalarMapperLegendFrame.h +++ b/ApplicationLibCode/UserInterface/RiuScalarMapperLegendFrame.h @@ -19,7 +19,6 @@ #include "RiaNumberFormat.h" -#include "RimRegularLegendConfig.h" #include "RiuAbstractLegendFrame.h" #include "cvfObject.h"