#4683 System : Remove obsolete include of cvfBase.h

2025-02-25 18:55:39 -06:00 · 2019-09-05 09:43:17 +02:00
parent 97d6638293
commit ef80f5b629
226 changed files with 226 additions and 226 deletions
--- 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"
--- 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 <vector>
--- 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"
--- 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"

--- 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
--- 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 <array>
--- 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"
--- 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"
--- 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 <array>
--- 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 <vector>
--- 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"
--- 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"
--- 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"

--- 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"
--- a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h
+++ b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h
@@ -19,7 +19,7 @@

 #pragma once

-#include "cvfBase.h"
+
 #include "cvfObject.h"

 namespace cvf
--- 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"

--- 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"
--- 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"

--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"

--- 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
--- 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"
--- 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"
--- a/ApplicationCode/ModelVisualization/RivPolylineGenerator.h
+++ b/ApplicationCode/ModelVisualization/RivPolylineGenerator.h
@@ -18,7 +18,7 @@

 #pragma once

-#include "cvfBase.h"
+
 #include "cvfObject.h"

 #include <cvfVector3.h>
--- 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"

--- 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"
--- 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"

--- 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"
--- 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"

--- 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"

--- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
+++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
@@ -24,7 +24,7 @@
 #include "RivReservoirPartMgr.h"    // Must include here because of caf::FixedArray<RivReservoirPartMgr, PROPERTY_FILTERED>

 #include "cvfArray.h"
-#include "cvfBase.h"
+
 #include "cvfTransform.h"

 #include "cafPdmObject.h"
--- 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"

--- 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
--- a/ApplicationCode/ModelVisualization/RivSimWellConnectionSourceInfo.h
+++ b/ApplicationCode/ModelVisualization/RivSimWellConnectionSourceInfo.h
@@ -20,7 +20,7 @@

 #include "cafPdmPointer.h"

-#include "cvfBase.h"
+
 #include "cvfObject.h"

 #include <vector>
--- 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"

--- 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"

--- a/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h
+++ b/ApplicationCode/ModelVisualization/RivSingleCellPartGenerator.h
@@ -19,7 +19,7 @@

 #pragma once

-#include "cvfBase.h"
+
 #include "cvfDrawableGeo.h"

 namespace cvf
--- 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"
--- 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"
--- 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"
--- a/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp
+++ b/ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp
@@ -18,7 +18,7 @@
 /////////////////////////////////////////////////////////////////////////////////


-#include "cvfBase.h"
+

 #include "RivTernarySaturationOverlayItem.h"

--- 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"
--- 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"

--- 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"
--- 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"

--- 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"

--- 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"
--- 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"
--- a/ApplicationCode/ModelVisualization/RivWellConnectionSourceInfo.h
+++ b/ApplicationCode/ModelVisualization/RivWellConnectionSourceInfo.h
@@ -20,7 +20,7 @@

 #include "cafPdmPointer.h"

-#include "cvfBase.h"
+
 #include "cvfObject.h"

 #include <vector>
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"

--- 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"

--- 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"
--- 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"