diff --git a/ApplicationCode/Application/RiaApplication.h b/ApplicationCode/Application/RiaApplication.h index a890acf9b4..01c0e12246 100644 --- a/ApplicationCode/Application/RiaApplication.h +++ b/ApplicationCode/Application/RiaApplication.h @@ -26,7 +26,7 @@ #include "cafPdmField.h" #include "cafPdmObject.h" -#include "cvfBase.h" + #include "cvfFont.h" #include "cvfObject.h" diff --git a/ApplicationCode/Application/RiaFontCache.h b/ApplicationCode/Application/RiaFontCache.h index fee3429ede..dd930c5807 100644 --- a/ApplicationCode/Application/RiaFontCache.h +++ b/ApplicationCode/Application/RiaFontCache.h @@ -19,7 +19,7 @@ #pragma once #include "cafFixedAtlasFont.h" -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/Application/RiaGuiApplication.h b/ApplicationCode/Application/RiaGuiApplication.h index 03918f5602..b7e93141e4 100644 --- a/ApplicationCode/Application/RiaGuiApplication.h +++ b/ApplicationCode/Application/RiaGuiApplication.h @@ -23,7 +23,7 @@ #include "cafPdmObject.h" #include "cafPdmField.h" -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/Application/Tools/RiaColorTools.h b/ApplicationCode/Application/Tools/RiaColorTools.h index 53e3ca3521..eb2de4dd97 100644 --- a/ApplicationCode/Application/Tools/RiaColorTools.h +++ b/ApplicationCode/Application/Tools/RiaColorTools.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfArray.h" #include diff --git a/ApplicationCode/Application/Tools/RiaProjectModifier.h b/ApplicationCode/Application/Tools/RiaProjectModifier.h index c853d87e48..a79cd5b329 100644 --- a/ApplicationCode/Application/Tools/RiaProjectModifier.h +++ b/ApplicationCode/Application/Tools/RiaProjectModifier.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/Application/Tools/WellPathTools/RiaArcCurveCalculator.h b/ApplicationCode/Application/Tools/WellPathTools/RiaArcCurveCalculator.h index 42ec9ecc6e..de2a7e5ff4 100644 --- a/ApplicationCode/Application/Tools/WellPathTools/RiaArcCurveCalculator.h +++ b/ApplicationCode/Application/Tools/WellPathTools/RiaArcCurveCalculator.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include "cvfMatrix4.h" diff --git a/ApplicationCode/Application/Tools/WellPathTools/RiaJCurveCalculator.h b/ApplicationCode/Application/Tools/WellPathTools/RiaJCurveCalculator.h index 0643f29dc2..f4d8e862e1 100644 --- a/ApplicationCode/Application/Tools/WellPathTools/RiaJCurveCalculator.h +++ b/ApplicationCode/Application/Tools/WellPathTools/RiaJCurveCalculator.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Application/Tools/WellPathTools/RiaLineArcWellPathCalculator.cpp b/ApplicationCode/Application/Tools/WellPathTools/RiaLineArcWellPathCalculator.cpp index 6bb4a09484..8db05db645 100644 --- a/ApplicationCode/Application/Tools/WellPathTools/RiaLineArcWellPathCalculator.cpp +++ b/ApplicationCode/Application/Tools/WellPathTools/RiaLineArcWellPathCalculator.cpp @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RiaLineArcWellPathCalculator.h" -#include "cvfBase.h" + #include "cvfAssert.h" #include "RiaOffshoreSphericalCoords.h" #include "RiaJCurveCalculator.h" diff --git a/ApplicationCode/Application/Tools/WellPathTools/RiaLineArcWellPathCalculator.h b/ApplicationCode/Application/Tools/WellPathTools/RiaLineArcWellPathCalculator.h index 0a06fe9245..6ad64f3448 100644 --- a/ApplicationCode/Application/Tools/WellPathTools/RiaLineArcWellPathCalculator.h +++ b/ApplicationCode/Application/Tools/WellPathTools/RiaLineArcWellPathCalculator.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/Application/Tools/WellPathTools/RiaPolyArcLineSampler.h b/ApplicationCode/Application/Tools/WellPathTools/RiaPolyArcLineSampler.h index 1d6e933f80..5b56b46b84 100644 --- a/ApplicationCode/Application/Tools/WellPathTools/RiaPolyArcLineSampler.h +++ b/ApplicationCode/Application/Tools/WellPathTools/RiaPolyArcLineSampler.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.h b/ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.h index b859121f98..3fbe1c2b3d 100644 --- a/ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.h +++ b/ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" class RiaSCurveCalculator diff --git a/ApplicationCode/Application/Tools/WellPathTools/RiaWellPlanCalculator.h b/ApplicationCode/Application/Tools/WellPathTools/RiaWellPlanCalculator.h index b9a201851e..bf7e6df3ba 100644 --- a/ApplicationCode/Application/Tools/WellPathTools/RiaWellPlanCalculator.h +++ b/ApplicationCode/Application/Tools/WellPathTools/RiaWellPlanCalculator.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.h b/ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.h index 6b4964701c..ba7afb6500 100644 --- a/ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.h +++ b/ApplicationCode/CommandFileInterface/Core/RicfFieldCapability.h @@ -22,7 +22,7 @@ #include "RicfMessages.h" #include "cafAppEnum.h" -#include "cvfBase.h" + #include "cvfColor3.h" #include diff --git a/ApplicationCode/Commands/AnnotationCommands/RicTextAnnotation3dEditor.h b/ApplicationCode/Commands/AnnotationCommands/RicTextAnnotation3dEditor.h index 82dc572068..a9bf361449 100644 --- a/ApplicationCode/Commands/AnnotationCommands/RicTextAnnotation3dEditor.h +++ b/ApplicationCode/Commands/AnnotationCommands/RicTextAnnotation3dEditor.h @@ -22,7 +22,7 @@ class RicPointTangentManipulator; -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.h b/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.h index 6f1a60bab1..381063fb8c 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.h +++ b/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicMswCompletions.h b/ApplicationCode/Commands/CompletionExportCommands/RicMswCompletions.h index 364f34f17a..4502ed30aa 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicMswCompletions.h +++ b/ApplicationCode/Commands/CompletionExportCommands/RicMswCompletions.h @@ -23,7 +23,7 @@ #include "RimWellPathAicdParameters.h" -#include "cvfBase.h" + #include "cvfMath.h" #include diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicMswSubSegment.h b/ApplicationCode/Commands/CompletionExportCommands/RicMswSubSegment.h index 6957ca2f6b..9e2cabc99a 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicMswSubSegment.h +++ b/ApplicationCode/Commands/CompletionExportCommands/RicMswSubSegment.h @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h index cd3f190357..322f59803e 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h +++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h @@ -25,7 +25,7 @@ #include -#include "cvfBase.h" + #include "cvfVector3.h" #include "cvfVector2.h" diff --git a/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.h b/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.h index 9039bc6cac..a7084afa71 100644 --- a/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.h +++ b/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.h @@ -19,7 +19,7 @@ #pragma once #include "cafCmdFeature.h" -#include "cvfBase.h" + #include "cvfArray.h" #include "cvfVector3.h" diff --git a/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.h b/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.h index 62facb2339..d55e87d0ad 100644 --- a/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.h +++ b/ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.h @@ -23,7 +23,7 @@ #include "cafPdmObject.h" #include "cafPdmChildArrayField.h" -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.h b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.h index ee928b1ced..b6405f3643 100644 --- a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.h +++ b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportImpl.h @@ -22,7 +22,7 @@ #include "VdeExportPart.h" -#include "cvfBase.h" + #include "cvfCollection.h" class QString; diff --git a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensRestClient.cpp b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensRestClient.cpp index 1d3d30f2d0..1e24027b18 100644 --- a/ApplicationCode/Commands/HoloLensCommands/RicHoloLensRestClient.cpp +++ b/ApplicationCode/Commands/HoloLensCommands/RicHoloLensRestClient.cpp @@ -18,7 +18,7 @@ #include "RicHoloLensRestClient.h" -#include "cvfBase.h" + #include "cvfTrace.h" #include diff --git a/ApplicationCode/Commands/HoloLensCommands/VdeExportPart.h b/ApplicationCode/Commands/HoloLensCommands/VdeExportPart.h index 044686785a..cab04cb09f 100644 --- a/ApplicationCode/Commands/HoloLensCommands/VdeExportPart.h +++ b/ApplicationCode/Commands/HoloLensCommands/VdeExportPart.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfPart.h" #include "cvfTextureImage.h" diff --git a/ApplicationCode/Commands/HoloLensCommands/VdeVizDataExtractor.h b/ApplicationCode/Commands/HoloLensCommands/VdeVizDataExtractor.h index d34eb0d4ba..9836160c70 100644 --- a/ApplicationCode/Commands/HoloLensCommands/VdeVizDataExtractor.h +++ b/ApplicationCode/Commands/HoloLensCommands/VdeVizDataExtractor.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfColor3.h" #include "cvfArray.h" #include "cvfVector3.h" diff --git a/ApplicationCode/Commands/IntersectionBoxCommands/RicBoxManipulatorEventHandler.h b/ApplicationCode/Commands/IntersectionBoxCommands/RicBoxManipulatorEventHandler.h index fcede0b889..2a82121906 100644 --- a/ApplicationCode/Commands/IntersectionBoxCommands/RicBoxManipulatorEventHandler.h +++ b/ApplicationCode/Commands/IntersectionBoxCommands/RicBoxManipulatorEventHandler.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfMatrix4.h" #include "cvfVector3.h" diff --git a/ApplicationCode/Commands/RicPickEventHandler.h b/ApplicationCode/Commands/RicPickEventHandler.h index 46fa57ec06..3b694a0ed1 100644 --- a/ApplicationCode/Commands/RicPickEventHandler.h +++ b/ApplicationCode/Commands/RicPickEventHandler.h @@ -25,7 +25,7 @@ #include "cafCmdFeature.h" #include "cafPickEventHandler.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulator.h b/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulator.h index 43474f8916..8a61610959 100644 --- a/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulator.h +++ b/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulator.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfMatrix4.h" #include "cvfVector3.h" diff --git a/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulatorPartMgr.h b/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulatorPartMgr.h index a7dca46733..678f8cbb8e 100644 --- a/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulatorPartMgr.h +++ b/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulatorPartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.h b/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.h index e32c7d6a72..bd83bd5058 100644 --- a/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.h +++ b/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.h @@ -22,7 +22,7 @@ class RicPointTangentManipulator; -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.h b/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.h index 9a7e567a4f..1038cb322d 100644 --- a/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.h +++ b/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.h @@ -22,7 +22,7 @@ class RicPointTangentManipulator; -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/FileInterface/RifEclipseInputFileTools.h b/ApplicationCode/FileInterface/RifEclipseInputFileTools.h index 717bd37e2f..c9bd36e537 100644 --- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.h +++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.h @@ -20,7 +20,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfCollection.h" diff --git a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.h b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.h index 5cd65f8e0b..88db658eb7 100644 --- a/ApplicationCode/FileInterface/RifEclipseOutputFileTools.h +++ b/ApplicationCode/FileInterface/RifEclipseOutputFileTools.h @@ -24,7 +24,7 @@ #include "ert/ecl/ecl_util.h" -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h b/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h index b5b0921a04..d5b6a71c83 100644 --- a/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h +++ b/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h @@ -20,7 +20,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/FileInterface/RifElementPropertyReader.h b/ApplicationCode/FileInterface/RifElementPropertyReader.h index 648af4f5e1..b03654d3b2 100644 --- a/ApplicationCode/FileInterface/RifElementPropertyReader.h +++ b/ApplicationCode/FileInterface/RifElementPropertyReader.h @@ -20,7 +20,7 @@ #include "RifElementPropertyTableReader.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/FileInterface/RifElementPropertyTableReader.h b/ApplicationCode/FileInterface/RifElementPropertyTableReader.h index 619178f86b..368ea79d83 100644 --- a/ApplicationCode/FileInterface/RifElementPropertyTableReader.h +++ b/ApplicationCode/FileInterface/RifElementPropertyTableReader.h @@ -22,7 +22,7 @@ #include #include -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/FileInterface/RifReaderEclipseRft.h b/ApplicationCode/FileInterface/RifReaderEclipseRft.h index f844ec0305..8ffc513ca3 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseRft.h +++ b/ApplicationCode/FileInterface/RifReaderEclipseRft.h @@ -24,7 +24,7 @@ #include #include -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/FileInterface/RifReaderFmuRft.h b/ApplicationCode/FileInterface/RifReaderFmuRft.h index da0a1726c9..7c75a4ed60 100644 --- a/ApplicationCode/FileInterface/RifReaderFmuRft.h +++ b/ApplicationCode/FileInterface/RifReaderFmuRft.h @@ -24,7 +24,7 @@ #include #include -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/FileInterface/RifReaderInterface.h b/ApplicationCode/FileInterface/RifReaderInterface.h index d2e2a1e7f8..4063eb008e 100644 --- a/ApplicationCode/FileInterface/RifReaderInterface.h +++ b/ApplicationCode/FileInterface/RifReaderInterface.h @@ -23,7 +23,7 @@ #include "RiaDefines.h" #include "RiaPorosityModel.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cafPdmPointer.h" diff --git a/ApplicationCode/FileInterface/RifStimPlanXmlReader.h b/ApplicationCode/FileInterface/RifStimPlanXmlReader.h index 3489930d2e..7bfe568c2c 100644 --- a/ApplicationCode/FileInterface/RifStimPlanXmlReader.h +++ b/ApplicationCode/FileInterface/RifStimPlanXmlReader.h @@ -20,7 +20,7 @@ #include "RiaEclipseUnitTools.h" -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/FileInterface/RifWellPathFormationReader.h b/ApplicationCode/FileInterface/RifWellPathFormationReader.h index 6270fcce94..a6d8a66527 100644 --- a/ApplicationCode/FileInterface/RifWellPathFormationReader.h +++ b/ApplicationCode/FileInterface/RifWellPathFormationReader.h @@ -24,7 +24,7 @@ #include #include -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/FileInterface/RifWellPathFormationsImporter.h b/ApplicationCode/FileInterface/RifWellPathFormationsImporter.h index b4b1402631..5b9993dc16 100644 --- a/ApplicationCode/FileInterface/RifWellPathFormationsImporter.h +++ b/ApplicationCode/FileInterface/RifWellPathFormationsImporter.h @@ -20,7 +20,7 @@ #include "RigWellPathFormations.h" -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.cpp b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.cpp index d080b06d86..af38f9c787 100644 --- a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.cpp +++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.cpp @@ -34,7 +34,7 @@ #include "RimViewController.h" #include "RimViewLinker.h" -#include "cvfBase.h" + #include "cvfStructGrid.h" #include "cvfStructGridGeometryGenerator.h" diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.h b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.h index 3af5f24282..622bb8c25b 100644 --- a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.h +++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemElmVisibilityCalculator.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfArray.h" #include "RimCellFilter.h" diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartGeometryGenerator.cpp b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartGeometryGenerator.cpp index 0963f1c6fe..1297e92825 100644 --- a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartGeometryGenerator.cpp +++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartGeometryGenerator.cpp @@ -21,7 +21,7 @@ #include "RigFemPart.h" -#include "cvfBase.h" + #include "cvfArray.h" #include "cvfDebugTimer.h" #include "cvfDrawableGeo.h" diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartGeometryGenerator.h b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartGeometryGenerator.h index 1d34cd6650..44c8e6d92e 100644 --- a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartGeometryGenerator.h +++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartGeometryGenerator.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfArray.h" diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.h b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.h index 031baf60e8..24569e307e 100644 --- a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.h +++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.h @@ -18,7 +18,7 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "RivFemPartGeometryGenerator.h" diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPickSourceInfo.h b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPickSourceInfo.h index c1f9ce29a9..fd5404978a 100644 --- a/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPickSourceInfo.h +++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivFemPickSourceInfo.h @@ -18,7 +18,7 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "cvfBase.h" + #include "cvfObject.h" class RivFemPartTriangleToElmMapper; diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.h b/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.h index 228b618709..2ee286ecb6 100644 --- a/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.h +++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfArray.h" #include "cvfCollection.h" diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgrCache.h b/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgrCache.h index 98a94f6d5f..a0e48865cf 100644 --- a/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgrCache.h +++ b/ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgrCache.h @@ -22,7 +22,7 @@ #include "RivCellSetEnum.h" #include "RivGeoMechPartMgr.h" -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/GeoMech/OdbReader/RifGeoMechReaderInterface.h b/ApplicationCode/GeoMech/OdbReader/RifGeoMechReaderInterface.h index bf7bdfe6dc..28e7274ce7 100644 --- a/ApplicationCode/GeoMech/OdbReader/RifGeoMechReaderInterface.h +++ b/ApplicationCode/GeoMech/OdbReader/RifGeoMechReaderInterface.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/GeoMech/OdbReader_UnitTests/main.cpp b/ApplicationCode/GeoMech/OdbReader_UnitTests/main.cpp index 143593e6c0..d837cc2ab2 100644 --- a/ApplicationCode/GeoMech/OdbReader_UnitTests/main.cpp +++ b/ApplicationCode/GeoMech/OdbReader_UnitTests/main.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "cvfBase.h" + #include "gtest/gtest.h" #include diff --git a/ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.h b/ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.h index 2cba4cf647..2ef87b6778 100644 --- a/ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.h +++ b/ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.h @@ -20,7 +20,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfCollection.h" #include "cvfModelBasicList.h" diff --git a/ApplicationCode/ModelVisualization/GridBox/RivPatchGenerator.h b/ApplicationCode/ModelVisualization/GridBox/RivPatchGenerator.h index 55c8390e82..28c20ca131 100644 --- a/ApplicationCode/ModelVisualization/GridBox/RivPatchGenerator.h +++ b/ApplicationCode/ModelVisualization/GridBox/RivPatchGenerator.h @@ -20,7 +20,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h b/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h index 24271ec944..eb70065eed 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivHexGridIntersectionTools.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" #include "cvfBoundingBox.h" diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.h index 64d0a512bd..530b48e214 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxGeometryGenerator.h @@ -23,7 +23,7 @@ #include "cafPdmPointer.h" #include "cvfArray.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.h index eb3ac71548..72f5af49fb 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.h @@ -20,7 +20,7 @@ #include "RivIntersectionBoxGeometryGenerator.h" -#include "cvfBase.h" + #include "cvfObject.h" namespace cvf diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.h index 24f36ed743..bed905d112 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxSourceInfo.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfArray.h" #include diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h index ba3d09a9e1..c4826380d4 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.h @@ -22,7 +22,7 @@ #include "cafPdmPointer.h" #include "cvfArray.h" -#include "cvfBase.h" + #include "cvfBoundingBox.h" #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h index 1b17779eee..4598d07523 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionPartMgr.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfArray.h" #include "cvfColor4.h" #include "cvfMatrix4.h" diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h index 15aa6feff5..6e05fabd97 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionSourceInfo.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfArray.h" #include diff --git a/ApplicationCode/ModelVisualization/Intersections/RivSectionFlattner.h b/ApplicationCode/ModelVisualization/Intersections/RivSectionFlattner.h index cc799d18ed..a44de2d378 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivSectionFlattner.h +++ b/ApplicationCode/ModelVisualization/Intersections/RivSectionFlattner.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfMatrix4.h" #include diff --git a/ApplicationCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.h b/ApplicationCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.h index df37a6da34..01af5823d8 100644 --- a/ApplicationCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.h +++ b/ApplicationCode/ModelVisualization/Riv3dWellLogCurveGeometryGenerator.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfDrawableGeo.h" #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ModelVisualization/Riv3dWellLogDrawSurfaceGenerator.h b/ApplicationCode/ModelVisualization/Riv3dWellLogDrawSurfaceGenerator.h index ea670cd176..d5472b424b 100644 --- a/ApplicationCode/ModelVisualization/Riv3dWellLogDrawSurfaceGenerator.h +++ b/ApplicationCode/ModelVisualization/Riv3dWellLogDrawSurfaceGenerator.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfDrawableGeo.h" #include "cvfDrawableVectors.h" #include "cvfObject.h" diff --git a/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.h b/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.h index 254308b2b6..63d8065abd 100644 --- a/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.h +++ b/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ModelVisualization/RivAnnotationsPartMgr.h b/ApplicationCode/ModelVisualization/RivAnnotationsPartMgr.h index 229e1c6728..9f2b0b6296 100644 --- a/ApplicationCode/ModelVisualization/RivAnnotationsPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivAnnotationsPartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfAssert.h" #include "cvfCollection.h" #include "cvfObject.h" diff --git a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h index 4a8a313736..56c9f360a3 100644 --- a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h +++ b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" namespace cvf diff --git a/ApplicationCode/ModelVisualization/RivCompletionTypeResultToTextureMapper.h b/ApplicationCode/ModelVisualization/RivCompletionTypeResultToTextureMapper.h index e7ab0a6d75..072f5be104 100644 --- a/ApplicationCode/ModelVisualization/RivCompletionTypeResultToTextureMapper.h +++ b/ApplicationCode/ModelVisualization/RivCompletionTypeResultToTextureMapper.h @@ -25,7 +25,7 @@ #include "cvfVector2.h" #include "cvfScalarMapper.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfStructGrid.h" diff --git a/ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.h b/ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.h index 8eaf61ddea..ab76f35915 100644 --- a/ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivContourMapProjectionPartMgr.h @@ -23,7 +23,7 @@ #include "cafPdmPointer.h" #include "cafDisplayCoordTransform.h" -#include "cvfBase.h" + #include "cvfDrawableGeo.h" #include "cvfDrawableText.h" #include "cvfModelBasicList.h" diff --git a/ApplicationCode/ModelVisualization/RivDefaultResultToTextureMapper.h b/ApplicationCode/ModelVisualization/RivDefaultResultToTextureMapper.h index 7d2f9ca0eb..fec98c0ffb 100644 --- a/ApplicationCode/ModelVisualization/RivDefaultResultToTextureMapper.h +++ b/ApplicationCode/ModelVisualization/RivDefaultResultToTextureMapper.h @@ -24,7 +24,7 @@ #include "cvfVector2.h" #include "cvfScalarMapper.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfStructGrid.h" diff --git a/ApplicationCode/ModelVisualization/RivFaultGeometryGenerator.h b/ApplicationCode/ModelVisualization/RivFaultGeometryGenerator.h index 416c256064..461dc55c39 100644 --- a/ApplicationCode/ModelVisualization/RivFaultGeometryGenerator.h +++ b/ApplicationCode/ModelVisualization/RivFaultGeometryGenerator.h @@ -18,7 +18,7 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfStructGridGeometryGenerator.h" diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.h b/ApplicationCode/ModelVisualization/RivFaultPartMgr.h index 38d8685a9b..d568a56e97 100644 --- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfArray.h" diff --git a/ApplicationCode/ModelVisualization/RivFishbonesSubsPartMgr.h b/ApplicationCode/ModelVisualization/RivFishbonesSubsPartMgr.h index 6d4d607842..742dbedc45 100644 --- a/ApplicationCode/ModelVisualization/RivFishbonesSubsPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivFishbonesSubsPartMgr.h @@ -20,7 +20,7 @@ #include "cafPdmPointer.h" -#include "cvfBase.h" + #include "cvfMatrix4.h" #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ModelVisualization/RivGridPartMgr.h b/ApplicationCode/ModelVisualization/RivGridPartMgr.h index 49e841f678..e3e0cbb1ad 100644 --- a/ApplicationCode/ModelVisualization/RivGridPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.h @@ -26,7 +26,7 @@ #include "cafPdmPointer.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfStructGridGeometryGenerator.h" diff --git a/ApplicationCode/ModelVisualization/RivMeasurementPartMgr.h b/ApplicationCode/ModelVisualization/RivMeasurementPartMgr.h index f624e8fc1e..9c6c09eda6 100644 --- a/ApplicationCode/ModelVisualization/RivMeasurementPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivMeasurementPartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfAssert.h" #include "cvfCollection.h" #include "cvfObject.h" diff --git a/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h b/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h index cb24bc489e..d49b93f2ba 100644 --- a/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h +++ b/ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h @@ -21,7 +21,7 @@ #include "RiaDefines.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfArray.h" diff --git a/ApplicationCode/ModelVisualization/RivObjectSourceInfo.h b/ApplicationCode/ModelVisualization/RivObjectSourceInfo.h index b3133fd796..3a2f1dfd6b 100644 --- a/ApplicationCode/ModelVisualization/RivObjectSourceInfo.h +++ b/ApplicationCode/ModelVisualization/RivObjectSourceInfo.h @@ -20,7 +20,7 @@ #include "cafPdmPointer.h" -#include "cvfBase.h" + #include "cvfObject.h" namespace caf diff --git a/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h b/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h index 3bb938f311..37cf45d92b 100644 --- a/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h +++ b/ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h @@ -20,7 +20,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfArray.h" #include "cvfPart.h" #include "cvfColor3.h" diff --git a/ApplicationCode/ModelVisualization/RivPolylineAnnotationPartMgr.h b/ApplicationCode/ModelVisualization/RivPolylineAnnotationPartMgr.h index d319870627..ca453c4a37 100644 --- a/ApplicationCode/ModelVisualization/RivPolylineAnnotationPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivPolylineAnnotationPartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfAssert.h" #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ModelVisualization/RivPolylineGenerator.h b/ApplicationCode/ModelVisualization/RivPolylineGenerator.h index 354ef4b87b..ead876b0b2 100644 --- a/ApplicationCode/ModelVisualization/RivPolylineGenerator.h +++ b/ApplicationCode/ModelVisualization/RivPolylineGenerator.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/ModelVisualization/RivPolylinesAnnotationSourceInfo.h b/ApplicationCode/ModelVisualization/RivPolylinesAnnotationSourceInfo.h index 82b0c7b847..99fe12a56b 100644 --- a/ApplicationCode/ModelVisualization/RivPolylinesAnnotationSourceInfo.h +++ b/ApplicationCode/ModelVisualization/RivPolylinesAnnotationSourceInfo.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cafPdmPointer.h" diff --git a/ApplicationCode/ModelVisualization/RivReachCircleAnnotationPartMgr.h b/ApplicationCode/ModelVisualization/RivReachCircleAnnotationPartMgr.h index 0c4891c130..7a0cd3eabc 100644 --- a/ApplicationCode/ModelVisualization/RivReachCircleAnnotationPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReachCircleAnnotationPartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfAssert.h" #include "cvfObject.h" #include "cafPdmPointer.h" diff --git a/ApplicationCode/ModelVisualization/RivReachCircleAnnotationSourceInfo.h b/ApplicationCode/ModelVisualization/RivReachCircleAnnotationSourceInfo.h index 95bd34948a..d607c5cf5f 100644 --- a/ApplicationCode/ModelVisualization/RivReachCircleAnnotationSourceInfo.h +++ b/ApplicationCode/ModelVisualization/RivReachCircleAnnotationSourceInfo.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cafPdmPointer.h" diff --git a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h index 76f881ce0f..1fbf88670a 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfArray.h" #include "cvfCollection.h" #include "cvfObject.h" diff --git a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h index 1b10818fec..a92a83c544 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReservoirPartMgr.h @@ -22,7 +22,7 @@ #include "RivCellSetEnum.h" -#include "cvfBase.h" + #include "cvfArray.h" #include "cvfCollection.h" diff --git a/ApplicationCode/ModelVisualization/RivReservoirSimWellsPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirSimWellsPartMgr.h index c4404449fa..e078c83646 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirSimWellsPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReservoirSimWellsPartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfCollection.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h index 27a43501df..b4e438bd30 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h @@ -24,7 +24,7 @@ #include "RivReservoirPartMgr.h" // Must include here because of caf::FixedArray #include "cvfArray.h" -#include "cvfBase.h" + #include "cvfTransform.h" #include "cafPdmObject.h" diff --git a/ApplicationCode/ModelVisualization/RivResultToTextureMapper.h b/ApplicationCode/ModelVisualization/RivResultToTextureMapper.h index 52ee510106..7b5138f2fa 100644 --- a/ApplicationCode/ModelVisualization/RivResultToTextureMapper.h +++ b/ApplicationCode/ModelVisualization/RivResultToTextureMapper.h @@ -23,7 +23,7 @@ #include "cvfVector2.h" #include "cvfScalarMapper.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfStructGrid.h" diff --git a/ApplicationCode/ModelVisualization/RivScalarMapperUtils.h b/ApplicationCode/ModelVisualization/RivScalarMapperUtils.h index 5be8f6ad9c..8d7d58ebc0 100644 --- a/ApplicationCode/ModelVisualization/RivScalarMapperUtils.h +++ b/ApplicationCode/ModelVisualization/RivScalarMapperUtils.h @@ -23,7 +23,7 @@ #include "cafEffectGenerator.h" -#include "cvfBase.h" + #include "cvfArray.h" namespace cvf diff --git a/ApplicationCode/ModelVisualization/RivSimWellConnectionSourceInfo.h b/ApplicationCode/ModelVisualization/RivSimWellConnectionSourceInfo.h index f2a879ffce..40d239e68b 100644 --- a/ApplicationCode/ModelVisualization/RivSimWellConnectionSourceInfo.h +++ b/ApplicationCode/ModelVisualization/RivSimWellConnectionSourceInfo.h @@ -20,7 +20,7 @@ #include "cafPdmPointer.h" -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/ModelVisualization/RivSimWellPipeSourceInfo.h b/ApplicationCode/ModelVisualization/RivSimWellPipeSourceInfo.h index 1cc8d28772..57483b1c0c 100644 --- a/ApplicationCode/ModelVisualization/RivSimWellPipeSourceInfo.h +++ b/ApplicationCode/ModelVisualization/RivSimWellPipeSourceInfo.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cafPdmPointer.h" diff --git a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.h b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.h index 6c70003f5e..db0ac01f9b 100644 --- a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.h @@ -20,7 +20,7 @@ #include "RigSimWellData.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h b/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h index 665acd59ce..5a5dbf8373 100644 --- a/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h +++ b/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfDrawableGeo.h" namespace cvf diff --git a/ApplicationCode/ModelVisualization/RivSourceInfo.h b/ApplicationCode/ModelVisualization/RivSourceInfo.h index 233db84d1a..7f6df64bc9 100644 --- a/ApplicationCode/ModelVisualization/RivSourceInfo.h +++ b/ApplicationCode/ModelVisualization/RivSourceInfo.h @@ -23,7 +23,7 @@ #include "RivObjectSourceInfo.h" #include "cvfArray.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfStructGridGeometryGenerator.h" diff --git a/ApplicationCode/ModelVisualization/RivTensorResultPartMgr.h b/ApplicationCode/ModelVisualization/RivTensorResultPartMgr.h index f990efd46e..5d38b1344c 100644 --- a/ApplicationCode/ModelVisualization/RivTensorResultPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivTensorResultPartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfArray.h" #include "cvfColor3.h" #include "cvfObject.h" diff --git a/ApplicationCode/ModelVisualization/RivTernaryResultToTextureMapper.h b/ApplicationCode/ModelVisualization/RivTernaryResultToTextureMapper.h index bf1094672d..d31a629c01 100644 --- a/ApplicationCode/ModelVisualization/RivTernaryResultToTextureMapper.h +++ b/ApplicationCode/ModelVisualization/RivTernaryResultToTextureMapper.h @@ -23,7 +23,7 @@ #include "RivTernaryScalarMapper.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfStructGrid.h" #include "cvfVector2.h" diff --git a/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp b/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp index c057098303..2dc9cd5740 100644 --- a/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp +++ b/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp @@ -18,7 +18,7 @@ ///////////////////////////////////////////////////////////////////////////////// -#include "cvfBase.h" + #include "RivTernarySaturationOverlayItem.h" diff --git a/ApplicationCode/ModelVisualization/RivTernaryScalarMapper.h b/ApplicationCode/ModelVisualization/RivTernaryScalarMapper.h index 2b3a297d89..5327b5dea1 100644 --- a/ApplicationCode/ModelVisualization/RivTernaryScalarMapper.h +++ b/ApplicationCode/ModelVisualization/RivTernaryScalarMapper.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector2.h" #include "cvfColor3.h" diff --git a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.h b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.h index 1ac11e9a0a..34d9b1b50c 100644 --- a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.h +++ b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.h @@ -22,7 +22,7 @@ #include "RigTernaryResultAccessor.h" #include "RivTernaryResultToTextureMapper.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfArray.h" diff --git a/ApplicationCode/ModelVisualization/RivTextAnnotationPartMgr.h b/ApplicationCode/ModelVisualization/RivTextAnnotationPartMgr.h index 84439117e7..44d19574b5 100644 --- a/ApplicationCode/ModelVisualization/RivTextAnnotationPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivTextAnnotationPartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfAssert.h" #include "cvfObject.h" #include "cafPdmPointer.h" diff --git a/ApplicationCode/ModelVisualization/RivTextLabelSourceInfo.h b/ApplicationCode/ModelVisualization/RivTextLabelSourceInfo.h index 9d5c338c1a..549cbf2373 100644 --- a/ApplicationCode/ModelVisualization/RivTextLabelSourceInfo.h +++ b/ApplicationCode/ModelVisualization/RivTextLabelSourceInfo.h @@ -21,7 +21,7 @@ #include "RivObjectSourceInfo.h" #include "cvfArray.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfString.h" diff --git a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.h b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.h index 898c4fdf41..8ecb2994bf 100644 --- a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.h +++ b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfArray.h" diff --git a/ApplicationCode/ModelVisualization/RivWellConnectionFactorGeometryGenerator.h b/ApplicationCode/ModelVisualization/RivWellConnectionFactorGeometryGenerator.h index 15dfbe95f0..fdfaf7f5c3 100644 --- a/ApplicationCode/ModelVisualization/RivWellConnectionFactorGeometryGenerator.h +++ b/ApplicationCode/ModelVisualization/RivWellConnectionFactorGeometryGenerator.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfMatrix4.h" #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ModelVisualization/RivWellConnectionFactorPartMgr.h b/ApplicationCode/ModelVisualization/RivWellConnectionFactorPartMgr.h index 2a1e50828b..ebb8c1cac9 100644 --- a/ApplicationCode/ModelVisualization/RivWellConnectionFactorPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivWellConnectionFactorPartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cafPdmPointer.h" diff --git a/ApplicationCode/ModelVisualization/RivWellConnectionSourceInfo.h b/ApplicationCode/ModelVisualization/RivWellConnectionSourceInfo.h index 36166ba817..73d0b70f9c 100644 --- a/ApplicationCode/ModelVisualization/RivWellConnectionSourceInfo.h +++ b/ApplicationCode/ModelVisualization/RivWellConnectionSourceInfo.h @@ -20,7 +20,7 @@ #include "cafPdmPointer.h" -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.h b/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.h index 6593462b40..6a4bbbbc5b 100644 --- a/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cafPdmPointer.h" diff --git a/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.h b/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.h index 57cf7bc444..7791f21dab 100644 --- a/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.h +++ b/ApplicationCode/ModelVisualization/RivWellFracturePartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfMatrix4.h" #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.h b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.h index b8dcf56a3e..aa7054be40 100644 --- a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfAssert.h" #include "cvfObject.h" #include "cafPdmPointer.h" diff --git a/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.h b/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.h index e0b3fbb99c..98ce7e0141 100644 --- a/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.h +++ b/ApplicationCode/ModelVisualization/RivWellPathSourceInfo.h @@ -21,7 +21,7 @@ #include "cafPdmPointer.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ModelVisualization/RivWellPathsPartMgr.h b/ApplicationCode/ModelVisualization/RivWellPathsPartMgr.h index dcbdece5e7..35fb008758 100644 --- a/ApplicationCode/ModelVisualization/RivWellPathsPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivWellPathsPartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfCollection.h" #include "cvfObject.h" diff --git a/ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.h b/ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.h index 209090c207..8b8262d078 100644 --- a/ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.cpp b/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.cpp index 03c7158f98..92fb7201c1 100644 --- a/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.cpp +++ b/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.cpp @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RivWindowEdgeAxesOverlayItem.h" -#include "cvfBase.h" + #include "cvfOpenGL.h" #include "cvfOpenGLResourceManager.h" #include "cvfGeometryBuilderDrawableGeo.h" diff --git a/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.h b/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.h index e8705bf39c..80fce0284a 100644 --- a/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.h +++ b/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/RivWindowEdgeAxesOverlayItem.h @@ -37,7 +37,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfOverlayItem.h" #include "cvfArray.h" #include "cvfCamera.h" diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimPolylineTarget.h b/ApplicationCode/ProjectDataModel/Annotations/RimPolylineTarget.h index 3403aa38f1..87f437c06a 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimPolylineTarget.h +++ b/ApplicationCode/ProjectDataModel/Annotations/RimPolylineTarget.h @@ -19,7 +19,7 @@ #pragma once #include "cafPdmObject.h" -#include "cvfBase.h" + #include "cvfVector3.h" #include "cafAppEnum.h" #include "cafPdmField.h" diff --git a/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.h b/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.h index 132e2f6625..3109490963 100644 --- a/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.h +++ b/ApplicationCode/ProjectDataModel/Annotations/RimPolylinesAnnotation.h @@ -22,7 +22,7 @@ #include "cafPdmObject.h" // Include to make Pdm work for cvf::Color -#include "cvfBase.h" + #include "cvfObject.h" class RigPolyLinesData; diff --git a/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.h b/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.h index e0fecd6ee9..e8d5a65e04 100644 --- a/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.h +++ b/ApplicationCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.h @@ -23,7 +23,7 @@ #include "cafPdmField.h" #include "cafPdmObject.h" -#include "cvfBase.h" + #include "cvfVector3.h" class Rim3dWellLogCurve; diff --git a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h index 9c1a392842..1f2d552f5f 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h @@ -26,7 +26,7 @@ #include "cafPdmObject.h" #include "cafPdmFieldCvfVec3d.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.h b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.h index b459c49f4b..99c3acb6b6 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPath.h @@ -33,7 +33,7 @@ #include "cafPdmFieldCvfVec3d.h" #include "cafPdmProxyValueField.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.h b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.h index 93c96d9f51..235cd1a446 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.h @@ -25,7 +25,7 @@ #include "RimFishbonesPipeProperties.h" #include "RimWellPathComponentInterface.h" -#include "cvfBase.h" + #include "cvfVector3.h" #include "cvfColor3.h" diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.h b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.h index 64a3e06ead..15fa03943f 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesPipeProperties.h @@ -20,7 +20,7 @@ #include "RiaEclipseUnitTools.h" -#include "cvfBase.h" + #include "cvfVector3.h" #include "cvfColor3.h" diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFracture.h b/ApplicationCode/ProjectDataModel/Completions/RimFracture.h index 973b2f4152..dc184fca55 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFracture.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimFracture.h @@ -25,7 +25,7 @@ #include "RimCheckableNamedObject.h" #include "RimWellPathComponentInterface.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" #include "cvfMatrix4.h" diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h index 0cd7d79784..8abc48763c 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h @@ -28,7 +28,7 @@ #include "cafPdmObject.h" #include "cafPdmProxyValueField.h" -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/ProjectDataModel/Completions/RimMultipleValveLocations.h b/ApplicationCode/ProjectDataModel/Completions/RimMultipleValveLocations.h index d96b44aa90..94ff181051 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimMultipleValveLocations.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimMultipleValveLocations.h @@ -22,7 +22,7 @@ #include "cafPdmBase.h" #include "cafPdmField.h" #include "cafPdmObject.h" -#include "cvfBase.h" + class RimMultipleValveLocations : public caf::PdmObject diff --git a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h index 8584da8194..c37391eeb0 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h @@ -27,7 +27,7 @@ #include "cafPdmObject.h" #include "cafPdmPtrField.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ProjectDataModel/Completions/RimWellPathComponentInterface.h b/ApplicationCode/ProjectDataModel/Completions/RimWellPathComponentInterface.h index 950d3e0c84..e392e36f20 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimWellPathComponentInterface.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimWellPathComponentInterface.h @@ -20,7 +20,7 @@ #include "RiaDefines.h" -#include "cvfBase.h" + #include "cvfColor3.h" //================================================================================================== diff --git a/ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.h b/ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.h index d5ad1d3ac7..1ed07d363e 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.h @@ -21,7 +21,7 @@ #include "cafPdmField.h" #include "cafPdmObject.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfColor3.h" diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellFilter.h b/ApplicationCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellFilter.h index e0eb10d594..e2753078c9 100644 --- a/ApplicationCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellFilter.h +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellFilter.h @@ -21,7 +21,7 @@ #include "RimCheckableNamedObject.h" #include "cvfArray.h" -#include "cvfBase.h" + //================================================================================================== /// diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellPropertyFilter.h b/ApplicationCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellPropertyFilter.h index 237f5a91d0..d5c5d0ecdc 100644 --- a/ApplicationCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellPropertyFilter.h +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/CellFilters/RimPlotCellPropertyFilter.h @@ -24,7 +24,7 @@ #include "cafPdmField.h" #include "cvfArray.h" -#include "cvfBase.h" + class RimEclipseResultDefinition; diff --git a/ApplicationCode/ProjectDataModel/Measurement/RimMeasurement.h b/ApplicationCode/ProjectDataModel/Measurement/RimMeasurement.h index 3b12ca0de0..4fb57dfcb0 100644 --- a/ApplicationCode/ProjectDataModel/Measurement/RimMeasurement.h +++ b/ApplicationCode/ProjectDataModel/Measurement/RimMeasurement.h @@ -19,7 +19,7 @@ #pragma once #include "cafPdmObject.h" -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/ProjectDataModel/Rim3dPropertiesInterface.h b/ApplicationCode/ProjectDataModel/Rim3dPropertiesInterface.h index 7536a2e253..0953a4a68f 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dPropertiesInterface.h +++ b/ApplicationCode/ProjectDataModel/Rim3dPropertiesInterface.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfBoundingBox.h" class Rim3dPropertiesInterface diff --git a/ApplicationCode/ProjectDataModel/Rim3dView.h b/ApplicationCode/ProjectDataModel/Rim3dView.h index 6d992c2074..8aa501d9a8 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dView.h +++ b/ApplicationCode/ProjectDataModel/Rim3dView.h @@ -33,7 +33,7 @@ #include "cafPdmFieldCvfMat4d.h" #include "cafPdmFieldCvfVec3d.h" -#include "cvfBase.h" + #include "cvfCollection.h" #include "cvfObject.h" diff --git a/ApplicationCode/ProjectDataModel/RimCase.h b/ApplicationCode/ProjectDataModel/RimCase.h index 088509a012..fc4322a595 100644 --- a/ApplicationCode/ProjectDataModel/RimCase.h +++ b/ApplicationCode/ProjectDataModel/RimCase.h @@ -25,7 +25,7 @@ #include "cafPdmChildField.h" #include "cafPdmChildArrayField.h" -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/ProjectDataModel/RimCommandObject.h b/ApplicationCode/ProjectDataModel/RimCommandObject.h index 8acf1c222d..d190fff49b 100644 --- a/ApplicationCode/ProjectDataModel/RimCommandObject.h +++ b/ApplicationCode/ProjectDataModel/RimCommandObject.h @@ -23,7 +23,7 @@ #include "cafPdmField.h" #include "cafPdmObject.h" #include "cafPdmObjectGroup.h" -#include "cvfBase.h" + #include "cvfObject.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.h b/ApplicationCode/ProjectDataModel/RimEclipseCase.h index ab94d5c59d..ce913c3788 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.h @@ -30,7 +30,7 @@ #include "cafPdmField.h" #include "cafPdmObject.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfColor3.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputCase.h b/ApplicationCode/ProjectDataModel/RimEclipseInputCase.h index 62af5761cc..d4f48a6b9a 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseInputCase.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseInputCase.h @@ -25,7 +25,7 @@ #include "cafPdmObject.h" #include "cafPdmProxyValueField.h" -#include "cvfBase.h" + #include "cvfObject.h" class RifReaderInterface; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.h b/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.h index 5fcc0b30a5..f36f42ce22 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseInputProperty.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cafPdmField.h" #include "cafPdmObject.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseInputPropertyCollection.h b/ApplicationCode/ProjectDataModel/RimEclipseInputPropertyCollection.h index ea9c409e14..8d5d8e26f4 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseInputPropertyCollection.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseInputPropertyCollection.h @@ -24,7 +24,7 @@ #include "cafPdmField.h" #include "cafPdmObject.h" -#include "cvfBase.h" + #include "cvfObject.h" class RimEclipseInputProperty; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.h b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.h index c861ae368a..77cf40db2a 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.h @@ -24,7 +24,7 @@ #include "RimEclipseCase.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cafPdmField.h" #include "cafPdmObject.h" diff --git a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.h b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.h index 7821779461..8d81f99658 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.h @@ -24,7 +24,7 @@ #include "cafPdmField.h" #include "cafPdmObject.h" -#include "cvfBase.h" + #include "cvfObject.h" class RimEclipseStatisticsCase; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.h b/ApplicationCode/ProjectDataModel/RimEclipseView.h index 57a590ab62..17d77dbab5 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.h @@ -26,7 +26,7 @@ #include "cafPdmObject.h" #include "cvfArray.h" -#include "cvfBase.h" + #include "cvfObject.h" // Includes to make Pdm work for cvf::Color and cvf:Mat diff --git a/ApplicationCode/ProjectDataModel/RimFaultInView.h b/ApplicationCode/ProjectDataModel/RimFaultInView.h index 28ab2cb27a..dc8747854c 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultInView.h +++ b/ApplicationCode/ProjectDataModel/RimFaultInView.h @@ -23,7 +23,7 @@ #include "cafPdmObject.h" #include "cafPdmPointer.h" -#include "cvfBase.h" + // Include to make Pdm work for cvf::Color #include "cafPdmFieldCvfColor.h" diff --git a/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.h b/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.h index 444d2148af..0f3e00d060 100644 --- a/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.h +++ b/ApplicationCode/ProjectDataModel/RimFaultInViewCollection.h @@ -26,7 +26,7 @@ #include "cafPdmObject.h" #include "cafPdmPointer.h" -#include "cvfBase.h" + // Include to make Pdm work for cvf::Color #include "cafPdmFieldCvfColor.h" diff --git a/ApplicationCode/ProjectDataModel/RimGridView.h b/ApplicationCode/ProjectDataModel/RimGridView.h index d4d23c37fe..336a8d346d 100644 --- a/ApplicationCode/ProjectDataModel/RimGridView.h +++ b/ApplicationCode/ProjectDataModel/RimGridView.h @@ -20,7 +20,7 @@ #include "Rim3dView.h" -#include "cvfBase.h" + #include "cvfArray.h" class RimAnnotationInViewCollection; diff --git a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.h b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.h index 8f3b5e921b..d918cb97d6 100644 --- a/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.h +++ b/ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.h @@ -26,7 +26,7 @@ #include "cafPdmField.h" #include "cafPdmObject.h" -#include "cvfBase.h" + #include "cvfObject.h" class RigActiveCellInfo; diff --git a/ApplicationCode/ProjectDataModel/RimIntersection.h b/ApplicationCode/ProjectDataModel/RimIntersection.h index d3c3bbfc61..fe36aa0391 100644 --- a/ApplicationCode/ProjectDataModel/RimIntersection.h +++ b/ApplicationCode/ProjectDataModel/RimIntersection.h @@ -25,7 +25,7 @@ #include "cafPdmObject.h" #include "cafPdmPtrField.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ProjectDataModel/RimIntersectionBox.h b/ApplicationCode/ProjectDataModel/RimIntersectionBox.h index e79ae8b017..52a02525ac 100644 --- a/ApplicationCode/ProjectDataModel/RimIntersectionBox.h +++ b/ApplicationCode/ProjectDataModel/RimIntersectionBox.h @@ -21,7 +21,7 @@ #include "cafPdmObject.h" #include "cafPdmField.h" -#include "cvfBase.h" + #include "cvfVector3.h" #include "cvfBoundingBox.h" diff --git a/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.h b/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.h index 3183bddcbc..8a41b512f6 100644 --- a/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.h +++ b/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.h @@ -22,7 +22,7 @@ #include "RimLegendConfig.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfArray.h" diff --git a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.h b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.h index b81de2127f..2fe37281e4 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.h +++ b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsStorage.h @@ -27,7 +27,7 @@ #include "cafPdmField.h" #include "cafPdmObject.h" -#include "cvfBase.h" + #include "cvfObject.h" diff --git a/ApplicationCode/ProjectDataModel/RimScaleLegendConfig.h b/ApplicationCode/ProjectDataModel/RimScaleLegendConfig.h index 5c031dc056..e1081b58fa 100644 --- a/ApplicationCode/ProjectDataModel/RimScaleLegendConfig.h +++ b/ApplicationCode/ProjectDataModel/RimScaleLegendConfig.h @@ -22,7 +22,7 @@ #include "RimLegendConfig.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfArray.h" diff --git a/ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.h b/ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.h index a0789eab9e..db43f72b49 100644 --- a/ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.h +++ b/ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.h @@ -21,7 +21,7 @@ #include "RimLegendConfig.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cafAppEnum.h" diff --git a/ApplicationCode/ProjectDataModel/RimViewController.h b/ApplicationCode/ProjectDataModel/RimViewController.h index c4cd5ba54b..741f97d719 100644 --- a/ApplicationCode/ProjectDataModel/RimViewController.h +++ b/ApplicationCode/ProjectDataModel/RimViewController.h @@ -24,7 +24,7 @@ #include "cafPdmPtrField.h" #include "cafQIconProvider.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "RivCellSetEnum.h" diff --git a/ApplicationCode/ProjectDataModel/RimViewLinker.h b/ApplicationCode/ProjectDataModel/RimViewLinker.h index 4592ce844c..81784660b7 100644 --- a/ApplicationCode/ProjectDataModel/RimViewLinker.h +++ b/ApplicationCode/ProjectDataModel/RimViewLinker.h @@ -26,7 +26,7 @@ #include "cafPdmObject.h" #include "cafPdmPtrField.h" -#include "cvfBase.h" + #include "cvfVector3.h" namespace caf diff --git a/ApplicationCode/ProjectDataModel/RimViewManipulator.cpp b/ApplicationCode/ProjectDataModel/RimViewManipulator.cpp index 7cd14eda25..c53bcb3c85 100644 --- a/ApplicationCode/ProjectDataModel/RimViewManipulator.cpp +++ b/ApplicationCode/ProjectDataModel/RimViewManipulator.cpp @@ -26,7 +26,7 @@ #include "RiuViewer.h" -#include "cvfBase.h" + #include "cvfBoundingBox.h" #include "cvfCamera.h" #include "cvfMatrix4.h" diff --git a/ApplicationCode/ProjectDataModel/RimWellLogFile.h b/ApplicationCode/ProjectDataModel/RimWellLogFile.h index f7954e69f1..1da1e7d9db 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogFile.h +++ b/ApplicationCode/ProjectDataModel/RimWellLogFile.h @@ -25,7 +25,7 @@ #include "cafPdmProxyValueField.h" #include "RigWellLogFile.h" -#include "cvfBase.h" + #include diff --git a/ApplicationCode/ProjectDataModel/RimWellPathAttribute.h b/ApplicationCode/ProjectDataModel/RimWellPathAttribute.h index 66e34c7607..30854de3b5 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathAttribute.h +++ b/ApplicationCode/ProjectDataModel/RimWellPathAttribute.h @@ -22,7 +22,7 @@ #include "cafPdmObject.h" #include "cafAppEnum.h" -#include "cvfBase.h" + #include "cafPdmField.h" #include diff --git a/ApplicationCode/ProjectDataModel/RimWellPathAttributeCollection.h b/ApplicationCode/ProjectDataModel/RimWellPathAttributeCollection.h index 6c610a2e32..f707448df5 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathAttributeCollection.h +++ b/ApplicationCode/ProjectDataModel/RimWellPathAttributeCollection.h @@ -20,7 +20,7 @@ #include "RimCheckableNamedObject.h" #include "cafAppEnum.h" -#include "cvfBase.h" + #include "cafPdmChildArrayField.h" #include "cafPdmField.h" #include "cafPdmObject.h" diff --git a/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.h b/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.h index 522545d401..b66d5fd2c3 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.h +++ b/ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.h @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cafPdmObject.h" #include "cafAppEnum.h" diff --git a/ApplicationCode/ProjectDataModel/RimWellPathTarget.h b/ApplicationCode/ProjectDataModel/RimWellPathTarget.h index 248eb5f99d..3499743ec6 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathTarget.h +++ b/ApplicationCode/ProjectDataModel/RimWellPathTarget.h @@ -19,7 +19,7 @@ #pragma once #include "cafPdmObject.h" -#include "cvfBase.h" + #include "cvfVector3.h" #include "cafAppEnum.h" #include "cafPdmField.h" diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.h index 158b65cb18..4abc672477 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.h @@ -19,7 +19,7 @@ #include "RimPlotCurve.h" -#include "cvfBase.h" + #include "cvfColor3.h" #include diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 6f22ba9930..e57122d8a4 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -43,7 +43,7 @@ #include "RiuPlotMainWindowTools.h" #include "RiuSummaryQwtPlot.h" -#include "cvfBase.h" + #include "cvfColor3.h" #include "cafPdmUiTreeOrdering.h" diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.h b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.h index 85eeb715b5..43db54d317 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.h +++ b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCalculator.h @@ -22,7 +22,7 @@ #include "RigEclipseToStimPlanCellTransmissibilityCalculator.h" -#include "cvfBase.h" + #include "cvfMatrix4.h" #include diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.h b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.h index 78711f2adb..9dd6b39659 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.h +++ b/ApplicationCode/ReservoirDataModel/Completions/RigEclipseToStimPlanCellTransmissibilityCalculator.h @@ -20,7 +20,7 @@ #include "RiaPorosityModel.h" -#include "cvfBase.h" + #include "cvfMatrix4.h" #include "cvfObject.h" diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigFractureTransmissibilityEquations.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigFractureTransmissibilityEquations.cpp index 40145f63ec..b51edcc5f7 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigFractureTransmissibilityEquations.cpp +++ b/ApplicationCode/ReservoirDataModel/Completions/RigFractureTransmissibilityEquations.cpp @@ -18,7 +18,7 @@ #include "RigFractureTransmissibilityEquations.h" -#include "cvfBase.h" + #include "cvfMath.h" #include "cvfVector2.h" diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigPerforationTransmissibilityEquations.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigPerforationTransmissibilityEquations.cpp index d0df5b8a31..920602f1a6 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigPerforationTransmissibilityEquations.cpp +++ b/ApplicationCode/ReservoirDataModel/Completions/RigPerforationTransmissibilityEquations.cpp @@ -18,7 +18,7 @@ #include "RigPerforationTransmissibilityEquations.h" -#include "cvfBase.h" + #include "cvfMath.h" #include diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp index c1f425c8cb..712bf92b27 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp +++ b/ApplicationCode/ReservoirDataModel/Completions/RigTransmissibilityCondenser.cpp @@ -24,7 +24,7 @@ #include "RiaWeightedMeanCalculator.h" #include "cvfAssert.h" -#include "cvfBase.h" + #include "cvfMath.h" #include diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.h b/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.h index a3a9b86e2b..ac1c9c0a89 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.h +++ b/ApplicationCode/ReservoirDataModel/Completions/RigVirtualPerforationTransmissibilities.h @@ -20,7 +20,7 @@ #include "RigCompletionData.h" -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.cpp index a3c5ccb0e0..4882d4ad85 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.cpp +++ b/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.cpp @@ -28,7 +28,7 @@ #include "RimSimWellFracture.h" #include "RimStimPlanFractureTemplate.h" -#include "cvfBase.h" + #include "cvfMath.h" #include "cvfMatrix4.h" diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.h b/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.h index e85005db8a..cb3f12e0e6 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.h +++ b/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfMatrix4.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.h b/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.h index f541cd6257..c01c3897d5 100644 --- a/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.h +++ b/ApplicationCode/ReservoirDataModel/RigAccWellFlowCalculator.h @@ -47,7 +47,7 @@ private: //================================================================================================== #include -#include "cvfBase.h" + #include "cvfVector3.h" struct RigWellResultPoint; diff --git a/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.h b/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.h index c3d6cf1fca..17fb619e0b 100644 --- a/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.h +++ b/ApplicationCode/ReservoirDataModel/RigActiveCellInfo.h @@ -20,7 +20,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" #include "cvfBoundingBox.h" diff --git a/ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.h b/ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.h index b4cc1bc0ad..494a08f9bf 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.h +++ b/ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigCaseToCaseCellMapper.h b/ApplicationCode/ReservoirDataModel/RigCaseToCaseCellMapper.h index b81bc1c03a..40de90d4be 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseToCaseCellMapper.h +++ b/ApplicationCode/ReservoirDataModel/RigCaseToCaseCellMapper.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfMath.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ReservoirDataModel/RigCaseToCaseCellMapperTools.h b/ApplicationCode/ReservoirDataModel/RigCaseToCaseCellMapperTools.h index 286a50d2a9..6748acede9 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseToCaseCellMapperTools.h +++ b/ApplicationCode/ReservoirDataModel/RigCaseToCaseCellMapperTools.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfMath.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ReservoirDataModel/RigCellGeometryTools.h b/ApplicationCode/ReservoirDataModel/RigCellGeometryTools.h index e76d114a05..828e34e264 100644 --- a/ApplicationCode/ReservoirDataModel/RigCellGeometryTools.h +++ b/ApplicationCode/ReservoirDataModel/RigCellGeometryTools.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include "cvfBoundingBox.h" diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseCrossPlotDataExtractor.h b/ApplicationCode/ReservoirDataModel/RigEclipseCrossPlotDataExtractor.h index ca6fdc9937..a0d16e772f 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseCrossPlotDataExtractor.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseCrossPlotDataExtractor.h @@ -19,7 +19,7 @@ #include "RigGridCrossPlotCurveGrouping.h" -#include "cvfBase.h" + #include "cvfArray.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.h b/ApplicationCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.h index e4c33b3e8a..b564008f78 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseMultiPropertyStatCalc.h @@ -21,7 +21,7 @@ #include "RigStatisticsCalculator.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfCollection.h" diff --git a/ApplicationCode/ReservoirDataModel/RigFault.h b/ApplicationCode/ReservoirDataModel/RigFault.h index 53b7b413db..647c7ee076 100644 --- a/ApplicationCode/ReservoirDataModel/RigFault.h +++ b/ApplicationCode/ReservoirDataModel/RigFault.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" #include "cvfBoundingBox.h" diff --git a/ApplicationCode/ReservoirDataModel/RigFishbonesGeometry.h b/ApplicationCode/ReservoirDataModel/RigFishbonesGeometry.h index 1cdd5653fa..0648ff050f 100644 --- a/ApplicationCode/ReservoirDataModel/RigFishbonesGeometry.h +++ b/ApplicationCode/ReservoirDataModel/RigFishbonesGeometry.h @@ -20,7 +20,7 @@ #include "cafPdmPointer.h" -#include "cvfBase.h" + #include "cvfVector3.h" #include "cvfMatrix4.h" diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResultFrames.h b/ApplicationCode/ReservoirDataModel/RigFlowDiagResultFrames.h index 84d926c576..98986eccf4 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResultFrames.h +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResultFrames.h @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h index 51e384b09f..4728a1f561 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagResults.h @@ -26,7 +26,7 @@ #include "cafPdmPointer.h" #include "cafAppEnum.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfArray.h" diff --git a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h index 10fdecd728..742114d860 100644 --- a/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h +++ b/ApplicationCode/ReservoirDataModel/RigFlowDiagSolverInterface.h @@ -18,7 +18,7 @@ #pragma once #include "RigFlowDiagResultAddress.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cafPdmPointer.h" diff --git a/ApplicationCode/ReservoirDataModel/RigFormationNames.h b/ApplicationCode/ReservoirDataModel/RigFormationNames.h index 87a951df45..f15a8bec70 100644 --- a/ApplicationCode/ReservoirDataModel/RigFormationNames.h +++ b/ApplicationCode/ReservoirDataModel/RigFormationNames.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigFractureCell.h b/ApplicationCode/ReservoirDataModel/RigFractureCell.h index 4a42e26a65..81fce1be19 100644 --- a/ApplicationCode/ReservoirDataModel/RigFractureCell.h +++ b/ApplicationCode/ReservoirDataModel/RigFractureCell.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigFractureGrid.h b/ApplicationCode/ReservoirDataModel/RigFractureGrid.h index c4e9a89784..4b253c3f2f 100644 --- a/ApplicationCode/ReservoirDataModel/RigFractureGrid.h +++ b/ApplicationCode/ReservoirDataModel/RigFractureGrid.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "RigFractureCell.h" diff --git a/ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.h b/ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.h index 83af692aa8..587cfc0d96 100644 --- a/ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.h +++ b/ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.h @@ -25,7 +25,7 @@ #include "cafTensor3.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfMath.h" #include "cvfStructGrid.h" diff --git a/ApplicationCode/ReservoirDataModel/RigGridBase.h b/ApplicationCode/ReservoirDataModel/RigGridBase.h index 9600f322e8..4277c602bd 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridBase.h +++ b/ApplicationCode/ReservoirDataModel/RigGridBase.h @@ -23,7 +23,7 @@ #include "RifReaderInterface.h" #include "RigFault.h" -#include "cvfBase.h" + #include "cvfVector3.h" #include "cvfBoundingBox.h" diff --git a/ApplicationCode/ReservoirDataModel/RigGridManager.h b/ApplicationCode/ReservoirDataModel/RigGridManager.h index df4c4d3fae..8e745f7fce 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridManager.h +++ b/ApplicationCode/ReservoirDataModel/RigGridManager.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfCollection.h" #include "cvfObject.h" diff --git a/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp b/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp index 218d8fb2f2..2e4f7c7f57 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp +++ b/ApplicationCode/ReservoirDataModel/RigGridScalarDataAccess.cpp @@ -19,7 +19,7 @@ #include "RigResultAccessObjectFactory.h" #include "cvfLibCore.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfAssert.h" diff --git a/ApplicationCode/ReservoirDataModel/RigHexIntersectionTools.h b/ApplicationCode/ReservoirDataModel/RigHexIntersectionTools.h index afb9a789c5..0c58766eba 100644 --- a/ApplicationCode/ReservoirDataModel/RigHexIntersectionTools.h +++ b/ApplicationCode/ReservoirDataModel/RigHexIntersectionTools.h @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include "cvfStructGrid.h" #include "cvfPlane.h" diff --git a/ApplicationCode/ReservoirDataModel/RigLasFileExporter.h b/ApplicationCode/ReservoirDataModel/RigLasFileExporter.h index 2fd2c8cda7..700d12478f 100644 --- a/ApplicationCode/ReservoirDataModel/RigLasFileExporter.h +++ b/ApplicationCode/ReservoirDataModel/RigLasFileExporter.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfCollection.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigNNCData.h b/ApplicationCode/ReservoirDataModel/RigNNCData.h index b19aa3c6ff..2f6702dc9f 100644 --- a/ApplicationCode/ReservoirDataModel/RigNNCData.h +++ b/ApplicationCode/ReservoirDataModel/RigNNCData.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" #include "cvfStructGrid.h" diff --git a/ApplicationCode/ReservoirDataModel/RigPipeInCellEvaluator.h b/ApplicationCode/ReservoirDataModel/RigPipeInCellEvaluator.h index 32edb8244f..5126e0b8ce 100644 --- a/ApplicationCode/ReservoirDataModel/RigPipeInCellEvaluator.h +++ b/ApplicationCode/ReservoirDataModel/RigPipeInCellEvaluator.h @@ -20,7 +20,7 @@ #pragma once #include -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfArray.h" diff --git a/ApplicationCode/ReservoirDataModel/RigPolyLinesData.h b/ApplicationCode/ReservoirDataModel/RigPolyLinesData.h index b5fbcc56c8..12c6d5644f 100644 --- a/ApplicationCode/ReservoirDataModel/RigPolyLinesData.h +++ b/ApplicationCode/ReservoirDataModel/RigPolyLinesData.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h index 682c548210..aee5b1b924 100644 --- a/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h +++ b/ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.h @@ -20,7 +20,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfArray.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessor.h b/ApplicationCode/ReservoirDataModel/RigResultAccessor.h index 616aafbf16..632670fd3a 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultAccessor.h +++ b/ApplicationCode/ReservoirDataModel/RigResultAccessor.h @@ -21,7 +21,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfStructGrid.h" diff --git a/ApplicationCode/ReservoirDataModel/RigSimWellData.h b/ApplicationCode/ReservoirDataModel/RigSimWellData.h index a8fa9c58e6..ef4ca9ba30 100644 --- a/ApplicationCode/ReservoirDataModel/RigSimWellData.h +++ b/ApplicationCode/ReservoirDataModel/RigSimWellData.h @@ -20,7 +20,7 @@ #include "RigWellResultPoint.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfMath.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ReservoirDataModel/RigSimulationWellCoordsAndMD.h b/ApplicationCode/ReservoirDataModel/RigSimulationWellCoordsAndMD.h index 50a72d71cd..661ad5e474 100644 --- a/ApplicationCode/ReservoirDataModel/RigSimulationWellCoordsAndMD.h +++ b/ApplicationCode/ReservoirDataModel/RigSimulationWellCoordsAndMD.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h b/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h index 70f4a6c3fc..3dac2288e1 100644 --- a/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h +++ b/ApplicationCode/ReservoirDataModel/RigStimPlanFractureDefinition.h @@ -20,7 +20,7 @@ #include "RiaEclipseUnitTools.h" -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ReservoirDataModel/RigTesselatorTools.h b/ApplicationCode/ReservoirDataModel/RigTesselatorTools.h index d7fd1d93e6..87765c2cce 100644 --- a/ApplicationCode/ReservoirDataModel/RigTesselatorTools.h +++ b/ApplicationCode/ReservoirDataModel/RigTesselatorTools.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigTransmissibilityEquations.h b/ApplicationCode/ReservoirDataModel/RigTransmissibilityEquations.h index 009cd7c4c4..dad053b91b 100644 --- a/ApplicationCode/ReservoirDataModel/RigTransmissibilityEquations.h +++ b/ApplicationCode/ReservoirDataModel/RigTransmissibilityEquations.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfMath.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ReservoirDataModel/RigWeightedMeanCalc.h b/ApplicationCode/ReservoirDataModel/RigWeightedMeanCalc.h index c3f58e6902..6f7bb73223 100644 --- a/ApplicationCode/ReservoirDataModel/RigWeightedMeanCalc.h +++ b/ApplicationCode/ReservoirDataModel/RigWeightedMeanCalc.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfArray.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigWellLogCurveData.h b/ApplicationCode/ReservoirDataModel/RigWellLogCurveData.h index 19d1e99cec..10c862ac40 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellLogCurveData.h +++ b/ApplicationCode/ReservoirDataModel/RigWellLogCurveData.h @@ -21,7 +21,7 @@ #include "RiaDefines.h" -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h b/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h index 07f6c44b0a..b52a9a3898 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h +++ b/ApplicationCode/ReservoirDataModel/RigWellLogExtractor.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfMath.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ReservoirDataModel/RigWellLogFile.h b/ApplicationCode/ReservoirDataModel/RigWellLogFile.h index c7d3f720b4..c35cf95d98 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellLogFile.h +++ b/ApplicationCode/ReservoirDataModel/RigWellLogFile.h @@ -21,7 +21,7 @@ #include "RiaDefines.h" -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigWellPath.h b/ApplicationCode/ReservoirDataModel/RigWellPath.h index a69073b2bd..a20b7fa044 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPath.h +++ b/ApplicationCode/ReservoirDataModel/RigWellPath.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfMath.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ReservoirDataModel/RigWellPathFormations.h b/ApplicationCode/ReservoirDataModel/RigWellPathFormations.h index cc2a7629c5..7696753a01 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPathFormations.h +++ b/ApplicationCode/ReservoirDataModel/RigWellPathFormations.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfMath.h" #include "cvfObject.h" diff --git a/ApplicationCode/ReservoirDataModel/RigWellPathGeometryTools.h b/ApplicationCode/ReservoirDataModel/RigWellPathGeometryTools.h index eac4d28076..fd892873e3 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPathGeometryTools.h +++ b/ApplicationCode/ReservoirDataModel/RigWellPathGeometryTools.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h b/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h index c5f8cf3b81..bfd052392b 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h +++ b/ApplicationCode/ReservoirDataModel/RigWellPathIntersectionTools.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfBoundingBox.h" #include "cvfVector3.h" diff --git a/ApplicationCode/ReservoirDataModel/RigWellResultPoint.h b/ApplicationCode/ReservoirDataModel/RigWellResultPoint.h index f4afe01fa2..802f31bdaa 100644 --- a/ApplicationCode/ReservoirDataModel/RigWellResultPoint.h +++ b/ApplicationCode/ReservoirDataModel/RigWellResultPoint.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/ReservoirDataModel/cvfGeometryTools.h b/ApplicationCode/ReservoirDataModel/cvfGeometryTools.h index 44c3d36485..935c00b08b 100644 --- a/ApplicationCode/ReservoirDataModel/cvfGeometryTools.h +++ b/ApplicationCode/ReservoirDataModel/cvfGeometryTools.h @@ -18,7 +18,7 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "cvfBase.h" + #include "cvfArray.h" #include #include diff --git a/ApplicationCode/ResultStatisticsCache/RigStatisticsCalculator.h b/ApplicationCode/ResultStatisticsCache/RigStatisticsCalculator.h index 0cfb64edcd..fa379e7fd9 100644 --- a/ApplicationCode/ResultStatisticsCache/RigStatisticsCalculator.h +++ b/ApplicationCode/ResultStatisticsCache/RigStatisticsCalculator.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfCollection.h" #include "cvfObject.h" diff --git a/ApplicationCode/ResultStatisticsCache/RigStatisticsDataCache.h b/ApplicationCode/ResultStatisticsCache/RigStatisticsDataCache.h index 5fe8fff99f..45310f2d83 100644 --- a/ApplicationCode/ResultStatisticsCache/RigStatisticsDataCache.h +++ b/ApplicationCode/ResultStatisticsCache/RigStatisticsDataCache.h @@ -21,7 +21,7 @@ #include "RigStatisticsCalculator.h" -#include "cvfBase.h" + #include "cvfObject.h" #include diff --git a/ApplicationCode/ResultStatisticsCache/RigStatisticsMath.cpp b/ApplicationCode/ResultStatisticsCache/RigStatisticsMath.cpp index 89cf45ab2b..79e24eb6c3 100644 --- a/ApplicationCode/ResultStatisticsCache/RigStatisticsMath.cpp +++ b/ApplicationCode/ResultStatisticsCache/RigStatisticsMath.cpp @@ -18,7 +18,7 @@ #include "RigStatisticsMath.h" -#include "cvfBase.h" + #include "cvfMath.h" #include diff --git a/ApplicationCode/UnitTests/RigWellPathIntersectionTools-Test.cpp b/ApplicationCode/UnitTests/RigWellPathIntersectionTools-Test.cpp index 777057a2ae..5910304261 100644 --- a/ApplicationCode/UnitTests/RigWellPathIntersectionTools-Test.cpp +++ b/ApplicationCode/UnitTests/RigWellPathIntersectionTools-Test.cpp @@ -20,7 +20,7 @@ #include "RigWellPath.h" -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/UserInterface/Riu3dSelectionManager.h b/ApplicationCode/UserInterface/Riu3dSelectionManager.h index 82baebb509..d1f3ac9d45 100644 --- a/ApplicationCode/UserInterface/Riu3dSelectionManager.h +++ b/ApplicationCode/UserInterface/Riu3dSelectionManager.h @@ -22,7 +22,7 @@ #include "cafPdmPointer.h" #include "cafPdmObject.h" -#include "cvfBase.h" + #include "cvfColor3.h" #include "cvfStructGrid.h" diff --git a/ApplicationCode/UserInterface/RiuFemResultTextBuilder.h b/ApplicationCode/UserInterface/RiuFemResultTextBuilder.h index 6d1953b16e..283b033f57 100644 --- a/ApplicationCode/UserInterface/RiuFemResultTextBuilder.h +++ b/ApplicationCode/UserInterface/RiuFemResultTextBuilder.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cafPdmPointer.h" #include "cvfStructGrid.h" diff --git a/ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.h b/ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.h index cefa1f943f..8715bf10ea 100644 --- a/ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.h +++ b/ApplicationCode/UserInterface/RiuFemTimeHistoryResultAccessor.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.cpp b/ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.cpp index f52c904dbc..7e7c5d882d 100644 --- a/ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.cpp +++ b/ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.cpp @@ -32,7 +32,7 @@ #include "RiuResultQwtPlot.h" #include "RiuQwtPlotTools.h" -#include "cvfBase.h" + #include "cvfColor3.h" #include "cafCmdFeatureMenuBuilder.h" diff --git a/ApplicationCode/UserInterface/RiuPickItemInfo.h b/ApplicationCode/UserInterface/RiuPickItemInfo.h index f554d04469..29e98ecc79 100644 --- a/ApplicationCode/UserInterface/RiuPickItemInfo.h +++ b/ApplicationCode/UserInterface/RiuPickItemInfo.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfVector3.h" #include diff --git a/ApplicationCode/UserInterface/RiuPvtPlotPanel.cpp b/ApplicationCode/UserInterface/RiuPvtPlotPanel.cpp index 19e12cd3fe..864536d2a2 100644 --- a/ApplicationCode/UserInterface/RiuPvtPlotPanel.cpp +++ b/ApplicationCode/UserInterface/RiuPvtPlotPanel.cpp @@ -23,7 +23,7 @@ #include "RigFlowDiagSolverInterface.h" -#include "cvfBase.h" + #include "cvfAssert.h" //#include "cvfTrace.h" #include "cvfMath.h" diff --git a/ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp b/ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp index cc024633a6..a57e0b5931 100644 --- a/ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp +++ b/ApplicationCode/UserInterface/RiuPvtPlotUpdater.cpp @@ -34,7 +34,7 @@ #include "Rim2dIntersectionView.h" #include "RimIntersection.h" -#include "cvfBase.h" + //#include "cvfTrace.h" #include diff --git a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp b/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp index 8c64960e65..dcf5bbfce8 100644 --- a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp +++ b/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp @@ -26,7 +26,7 @@ #include "RiaCurveDataTools.h" #include "RigFlowDiagSolverInterface.h" -#include "cvfBase.h" + #include "cvfAssert.h" #include "cvfTrace.h" diff --git a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp b/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp index ca5356046a..22b940bbcd 100644 --- a/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp +++ b/ApplicationCode/UserInterface/RiuRelativePermeabilityPlotUpdater.cpp @@ -33,7 +33,7 @@ #include "Rim2dIntersectionView.h" #include "RimIntersection.h" -#include "cvfBase.h" + //#include "cvfTrace.h" #include diff --git a/ApplicationCode/UserInterface/RiuResultQwtPlot.cpp b/ApplicationCode/UserInterface/RiuResultQwtPlot.cpp index 45d3a9d0ae..3684bfcdd4 100644 --- a/ApplicationCode/UserInterface/RiuResultQwtPlot.cpp +++ b/ApplicationCode/UserInterface/RiuResultQwtPlot.cpp @@ -33,7 +33,7 @@ #include "cafCmdFeatureMenuBuilder.h" -#include "cvfBase.h" + #include "cvfColor3.h" #include "qwt_date_scale_draw.h" diff --git a/ApplicationCode/UserInterface/RiuResultTextBuilder.h b/ApplicationCode/UserInterface/RiuResultTextBuilder.h index 03a54e0efe..ec5bb44461 100644 --- a/ApplicationCode/UserInterface/RiuResultTextBuilder.h +++ b/ApplicationCode/UserInterface/RiuResultTextBuilder.h @@ -19,7 +19,7 @@ #pragma once -#include "cvfBase.h" + #include "cafPdmPointer.h" #include "cvfStructGrid.h" diff --git a/ApplicationCode/UserInterface/RiuTimeStepChangedHandler.cpp b/ApplicationCode/UserInterface/RiuTimeStepChangedHandler.cpp index e8da3853ba..a475789363 100644 --- a/ApplicationCode/UserInterface/RiuTimeStepChangedHandler.cpp +++ b/ApplicationCode/UserInterface/RiuTimeStepChangedHandler.cpp @@ -27,7 +27,7 @@ #include "Rim3dView.h" -#include "cvfBase.h" + #include "cvfTrace.h" #include "cvfDebugTimer.h" diff --git a/ApplicationCode/UserInterface/RiuViewerToViewInterface.h b/ApplicationCode/UserInterface/RiuViewerToViewInterface.h index a8980bc76b..5b4271a797 100644 --- a/ApplicationCode/UserInterface/RiuViewerToViewInterface.h +++ b/ApplicationCode/UserInterface/RiuViewerToViewInterface.h @@ -18,7 +18,7 @@ #pragma once -#include "cvfBase.h" + #include "cvfObject.h" #include "cvfColor3.h" #include "cvfMatrix4.h"