#4683 System : Remove obsolete include of cvfBase.h

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

--- 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 <map>
--- 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 <QApplication>
--- 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 <QColor>
--- 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 <QString>
--- 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"

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

 //--------------------------------------------------------------------------------------------------
--- 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"
--- 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 <vector>
--- 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 <vector>
--- 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
--- 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 <vector>
--- 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 <QTextStream>
--- 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"

--- 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 <map>
--- 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 <QString>
--- 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 <QString>
--- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h
+++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h
@ -25,7 +25,7 @@

 #include <QFile>

-#include "cvfBase.h"
+
 #include "cvfVector3.h"
 #include "cvfVector2.h"

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

--- 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 <QString>
--- 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;
--- 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 <QNetworkRequest>
--- 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"
--- 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"
--- 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"
--- 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"

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

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

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

--- 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 <QString>
--- a/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h
+++ b/ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h
@ -20,7 +20,7 @@

 #pragma once

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

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

--- a/ApplicationCode/FileInterface/RifElementPropertyTableReader.h
+++ b/ApplicationCode/FileInterface/RifElementPropertyTableReader.h
@ -22,7 +22,7 @@
 #include <utility>
 #include <vector>

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

 #include <QString>
--- a/ApplicationCode/FileInterface/RifReaderEclipseRft.h
+++ b/ApplicationCode/FileInterface/RifReaderEclipseRft.h
@ -24,7 +24,7 @@
 #include <string>
 #include <vector>

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

 #include <QDateTime>
--- a/ApplicationCode/FileInterface/RifReaderFmuRft.h
+++ b/ApplicationCode/FileInterface/RifReaderFmuRft.h
@ -24,7 +24,7 @@
 #include <string>
 #include <vector>

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

 #include <QDateTime>
--- 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"
--- a/ApplicationCode/FileInterface/RifStimPlanXmlReader.h
+++ b/ApplicationCode/FileInterface/RifStimPlanXmlReader.h
@ -20,7 +20,7 @@

 #include "RiaEclipseUnitTools.h"

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

 #include <QString>
--- a/ApplicationCode/FileInterface/RifWellPathFormationReader.h
+++ b/ApplicationCode/FileInterface/RifWellPathFormationReader.h
@ -24,7 +24,7 @@
 #include <utility>
 #include <vector>

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

 #include <QString>
--- a/ApplicationCode/FileInterface/RifWellPathFormationsImporter.h
+++ b/ApplicationCode/FileInterface/RifWellPathFormationsImporter.h
@ -20,7 +20,7 @@

 #include "RigWellPathFormations.h"

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

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

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

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

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

--- 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 <stdio.h>
--- 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/Show More
+++ b/Show More