#14476 ApplicationLibCode: Remove unused cvf includes

Remove 95 cvf include lines that the including file does not use. Found by
extracting the symbols declared by every VizFwk header, including symbols they
re-export, and flagging includes where none of those symbols appear anywhere in
the file. Each removal is verified by a full build.

Most of them are cvfVector3.h and cvfObject.h, left behind as the files they
were once needed by changed.

pch.h is left untouched. It includes cvfObject.h and cvfVector3.h on purpose, so
that the files using the precompiled header do not have to.

Note that a clean build after removing an include does not prove the include was
unnecessary, only that the declarations still arrive some other way. That path
can differ between platforms and with RESINSIGHT_ENABLE_UNITY_BUILD, so this
needs a CI round on Linux as well.
This commit is contained in:
Magne Sjaastad
2026-08-07 15:05:57 +02:00
parent 0a4bebcd41
commit 1c4c304064
88 changed files with 0 additions and 137 deletions
@@ -52,7 +52,6 @@
#include "cafAssert.h"
#include "cafProgressInfo.h"
#include "cafSelectionManager.h"
#include "cvfMath.h"
#include <QAction>
#include <QDateTime>
@@ -47,8 +47,6 @@
#include "cafSelectionManager.h"
#include "cafUtils.h"
#include "cvfMath.h"
#include <QAction>
#include <QDir>
@@ -22,9 +22,6 @@
#include "cafVecIjk.h"
#include "cvfArray.h"
#include "cvfVector3.h"
#include <expected>
class RimEclipseView;
@@ -23,7 +23,6 @@
#include "RigBoundingBoxIjk.h"
#include "cafVecIjk.h"
#include "cvfVector3.h"
#include <QPointer>
@@ -37,8 +37,6 @@
#include "cafPdmUiTextEditor.h"
#include "cafSelectionManagerTools.h"
#include "cvfBoundingBox.h"
#include <algorithm>
CAF_PDM_SOURCE_INIT( RiuCreateMultipleFractionsUi, "RiuCreateMultipleFractionsUi" );
@@ -22,8 +22,6 @@
#include "VdeExportPart.h"
#include "cvfCollection.h"
class QString;
class RimGridView;
@@ -30,8 +30,6 @@
#include "cafSelectionManagerTools.h"
#include "cvfCamera.h"
#include <QAction>
CAF_CMD_SOURCE_INIT( RicNewIntersectionViewFeature, "RicNewIntersectionViewFeature" );
@@ -42,8 +42,6 @@
#include "cafDataLoadController.h"
#include "cafProgressInfo.h"
#include "cvfObject.h"
#include <QAction>
#include <QDir>
@@ -25,9 +25,6 @@
#include "cafCmdFeature.h"
#include "cafPickEventHandler.h"
#include "cvfObject.h"
#include "cvfVector3.h"
namespace cvf
{
class Part;
@@ -49,7 +49,6 @@
#include "cafPdmUiPropertyViewDialog.h"
#include "cafAssert.h"
#include "cvfColor3.h"
#include <QAction>
@@ -20,8 +20,6 @@
#include "cafCmdFeature.h"
#include "cvfVector3.h"
#include <vector>
//==================================================================================================
@@ -20,8 +20,6 @@
#include "cafCmdFeature.h"
#include "cvfVector3.h"
#include <vector>
//==================================================================================================
@@ -33,8 +33,6 @@
#include "cafPdmUiTextEditor.h"
#include "cafSelectionManagerTools.h"
#include "cvfBoundingBox.h"
#include <algorithm>
CAF_PDM_SOURCE_INIT( RicCreateMultipleWellPathLateralsUi, "RicCreateMultipleWellPathLateralsUi" );
@@ -21,7 +21,6 @@
#include "RifElementPropertyTableReader.h"
#include "cvfObject.h"
#include "cvfVector3.h"
#include <map>
#include <string>
@@ -54,8 +54,6 @@
#include "cafAssert.h"
#include "cafProgressInfo.h"
#include "cvfTrace.h"
#include "ert/ecl/ecl_kw_magic.h"
#include "ert/ecl/ecl_nnc_data.h"
#include "ert/ecl/ecl_nnc_export.h"
@@ -23,7 +23,6 @@
#include "RifReaderInterface.h"
#include "cvfCollection.h"
#include "cvfVector3.h"
#include <memory>
@@ -22,8 +22,6 @@
#include "RigPressureDepthData.h"
#include "cvfObject.h"
#include <map>
#include <string>
#include <vector>
@@ -22,7 +22,6 @@
#include "RigFemPart.h"
#include "cvfArray.h"
#include "cvfDebugTimer.h"
#include "cvfDrawableGeo.h"
#include "cvfOutlineEdgeExtractor.h"
#include "cvfPrimitiveSetIndexedUInt.h"
@@ -34,7 +34,6 @@
#include "RivFaultPartMgr.h"
#include "cvfColor3.h"
#include "cvfModelBasicList.h"
#include "cvfPart.h"
#include "cvfTransform.h"
@@ -25,7 +25,6 @@
#include "cvfArray.h"
#include "cvfObject.h"
#include "cvfVector3.h"
#include <vector>
@@ -21,7 +21,6 @@
#include "cvfArray.h"
#include "cvfCollection.h"
#include "cvfColor4.h"
#include "cvfMatrix4.h"
#include "cvfObject.h"
#include "cvfVector3.h"
@@ -22,7 +22,6 @@
#include "cvfArray.h"
#include "cvfObject.h"
#include "cvfVector3.h"
#include <vector>
@@ -26,7 +26,6 @@
#include "cvfScalarMapper.h"
#include "cvfVector2.h"
#include "cvfObject.h"
#include "cvfStructGrid.h"
#include <cmath>
@@ -26,7 +26,6 @@
#include "cvfScalarMapper.h"
#include "cvfVector2.h"
#include "cvfObject.h"
#include "cvfStructGrid.h"
#include <cmath>
@@ -21,10 +21,8 @@
#include "cafPdmPointer.h"
#include "cvfObject.h"
#include "cvfVector3.h"
#include "cvfCollection.h"
#include "cvfColor3.h"
namespace cvf
{
@@ -19,7 +19,6 @@
#pragma once
#include "cvfCollection.h"
#include "cvfVector3.h"
#include "cafPdmPointer.h"
@@ -24,7 +24,6 @@
#include "cvfCollection.h"
#include "cvfObject.h"
#include "cvfVector3.h"
#include <list>
@@ -22,7 +22,6 @@
#include "cvfArray.h"
#include "cvfObject.h"
#include "cvfString.h"
//==================================================================================================
@@ -27,7 +27,6 @@
#include "cafPdmFieldCvfVec3d.h"
#include "cafPdmPointer.h"
#include "cvfObject.h"
#include "cvfVector3.h"
#include <vector>
@@ -28,9 +28,6 @@
#include "cafPdmFieldCvfColor.h"
#include "cafPdmFieldCvfVec3d.h"
#include "cvfObject.h"
#include "cvfVector3.h"
#include <vector>
class QString;
@@ -27,7 +27,6 @@
#include "cafPdmFieldCvfVec3d.h"
#include "cafPdmProxyValueField.h"
#include "cvfObject.h"
#include "cvfVector3.h"
#include <memory>
@@ -20,9 +20,6 @@
#include "RiaDefines.h"
#include "cvfColor3.h"
#include "cvfVector3.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
@@ -35,8 +35,6 @@
#include "cafPdmUiDoubleValueEditor.h"
#include "cafPdmUiTextEditor.h"
#include "cvfVector3.h"
#include <cmath>
namespace caf
@@ -26,9 +26,6 @@
#include "cafPdmObject.h"
#include "cafPdmPtrField.h"
#include "cvfObject.h"
#include "cvfVector3.h"
#include <vector>
//==================================================================================================
@@ -22,8 +22,6 @@
#include "RimFaultReactivationEnums.h"
#include "cvfVector3.h"
#include <map>
#include <memory>
#include <vector>
@@ -26,8 +26,6 @@
#include "cafPdmField.h"
#include "cafPdmPtrField.h"
#include "cvfObject.h"
class RigGriddedPart3d;
class RimModeledWellPath;
class RigWellPath;
@@ -37,7 +37,6 @@
#include "RimFaultReactivationDataAccessorWellLogExtraction.h"
#include "RimFaultReactivationEnums.h"
#include "cvfObject.h"
#include "cvfVector3.h"
#include "cafAssert.h"
@@ -22,7 +22,6 @@
#include "cafPdmObject.h"
#include "cvfColor3.h"
#include "cvfObject.h"
class RigFlowDiagResults;
@@ -35,8 +35,6 @@
#include "RiuTofAccumulatedPhaseFractionsPlot.h"
#include "RiuWellAllocationPlot.h"
#include "cvfColor3.h"
CAF_PDM_SOURCE_INIT( RimTofAccumulatedPhaseFractionsPlot, "TofAccumulatedPhaseFractionsPlot" );
//--------------------------------------------------------------------------------------------------
@@ -51,8 +51,6 @@
#include "cafPdmUiToolButtonEditor.h"
#include "cafPdmUiTreeSelectionEditor.h"
#include "cvfScalarMapper.h"
#include <QPainter>
CAF_PDM_SOURCE_INIT( RimWellConnectivityTable, "RimWellConnectivityTable" );
@@ -26,7 +26,6 @@
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmPtrField.h"
#include "cvfCollection.h"
#include <QDate>
#include <QMetaType>
@@ -40,8 +40,6 @@
#include "cafPdmUiLineEditor.h"
#include "cafPdmUiTextEditor.h"
#include "cvfMath.h"
CAF_PDM_SOURCE_INIT( RimGridCrossPlotRegressionCurve, "GridCrossPlotRegressionCurve" );
namespace caf
@@ -21,7 +21,6 @@
#include "cafPdmObject.h"
#include "cafPdmFieldCvfColor.h"
#include "cvfVector3.h"
class RigPolyLinesData;
@@ -38,8 +38,6 @@
#include "cafPdmUiTreeOrdering.h"
#include "cafPdmUiTreeSelectionEditor.h"
#include "cvfMath.h"
#include <array>
namespace caf
@@ -21,7 +21,6 @@
#include "cafAppEnum.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cvfObject.h"
class QString;
@@ -30,8 +30,6 @@
#include "cafPdmUiSliderEditor.h"
#include "cafPdmUiTreeAttributes.h"
#include "cvfVector2.h"
#include <cmath>
namespace caf
@@ -26,7 +26,6 @@
#include "cafPdmChildArrayField.h"
#include "cafPdmChildField.h"
#include "cafPdmDocument.h"
#include "cvfCollection.h"
#include <vector>
@@ -48,8 +48,6 @@
#include "cafPdmUiDoubleSliderEditor.h"
#include "cafPdmUiSliderTools.h"
#include "cvfMath.h"
#include <cmath>
#include <limits>
@@ -23,8 +23,6 @@
#include "RiaStimPlanModelDefines.h"
#include "cvfObject.h"
#include <vector>
class RigEclipseCaseData;
@@ -52,8 +52,6 @@
#include "cafPdmUiTreeOrdering.h"
#include "cafPdmUiTreeSelectionEditor.h"
#include "cvfBoundingBox.h"
#include <cmath>
#include <QString>
@@ -22,8 +22,6 @@
#include "cafPdmProxyValueField.h"
#include "cafPdmPtrField.h"
#include "cvfObject.h"
class RimProject;
class RimEclipseCase;
class RifSummaryReaderInterface;
@@ -22,7 +22,6 @@
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cvfObject.h"
class RifSummaryReaderInterface;
class RifCalculatedSummaryCurveReader;
@@ -24,7 +24,6 @@
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cvfObject.h"
//==================================================================================================
//
@@ -22,7 +22,6 @@
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cvfObject.h"
class RifReaderObservedData;
@@ -40,8 +40,6 @@
#include "cafPdmUiToolButtonEditor.h"
#include "cafPdmUiTreeSelectionEditor.h"
#include "cvfScalarMapper.h"
CAF_PDM_SOURCE_INIT( RimSummaryTable, "RimSummaryTable" );
//--------------------------------------------------------------------------------------------------
@@ -44,8 +44,6 @@
#include "Riu3DMainWindowTools.h"
#include "cvfMath.h"
#include "cafPdmFieldScriptingCapability.h"
#include "cafPdmObjectScriptingCapability.h"
#include "cafPdmUiTreeOrdering.h"
@@ -21,7 +21,6 @@
#include "RimWellLogCurve.h"
#include "cafPdmPtrField.h"
#include "cvfObject.h"
class RimCase;
class RimWellPath;
@@ -22,8 +22,6 @@
#include "cafPdmObjectHandle.h"
#include "cafPdmObjectMethod.h"
#include "cvfVector3.h"
#include <QString>
//==================================================================================================
@@ -21,7 +21,6 @@
#include "RigEclipseToStimPlanCellTransmissibilityCalculator.h"
#include "cvfMatrix4.h"
#include "cvfObject.h"
#include "RimThermalFractureTemplate.h"
@@ -18,8 +18,6 @@
#pragma once
#include "cvfObject.h"
#include <QString>
#include <map>
@@ -20,7 +20,6 @@
#pragma once
#include "cvfObject.h"
#include "cvfVector3.h"
#include <vector>
@@ -19,7 +19,6 @@
#pragma once
#include "cvfObject.h"
#include "cvfVector3.h"
#include <vector>
@@ -21,7 +21,6 @@
#include "RigFault.h"
#include "RigNncConnection.h"
#include "cvfCollection.h"
#include "cvfStructGrid.h"
#include "cvfVector3.h"
@@ -29,8 +29,6 @@
#include "RigEclipseResultAddress.h"
#include "RigNNCData.h"
#include "cvfArray.h"
class RigEclipseAllanFaultsStatCalc : public RigStatisticsCalculator
{
public:
@@ -27,7 +27,6 @@
#include "cvfCollection.h"
#include "cvfObject.h"
#include "cvfStructGrid.h"
#include "cvfVector3.h"
#include <map>
#include <set>
@@ -23,7 +23,6 @@
#include "cafVecIjk.h"
#include "cvfBoundingBox.h"
#include "cvfObject.h"
#include "cvfVector3.h"
#include <utility>
@@ -22,7 +22,6 @@
#include "RigStatisticsCalculator.h"
#include "cvfCollection.h"
#include "cvfObject.h"
#include <vector>
@@ -22,7 +22,6 @@
#include <vector>
#include "cafVecIjk.h"
#include "cvfArray.h"
#include "cvfStructGrid.h"
class RimEclipseCase;
@@ -44,8 +44,6 @@
#include "cafProgressInfo.h"
#include "cvfTrace.h"
class RigOpmFlowDiagStaticData
{
public:
@@ -20,8 +20,6 @@
#include "RigFlowDiagDefines.h"
#include "cvfTrace.h"
#include "cafAssert.h"
#include <set>
@@ -19,7 +19,6 @@
#pragma once
#include "cafTensor3.h"
#include "cvfVector3.h"
#include "cvfVector4.h"
#include <vector>
@@ -25,7 +25,6 @@
#include "cvfObject.h"
#include "cvfStructGrid.h"
#include "cvfVector3.h"
#include <QStringList>
@@ -38,8 +38,6 @@
#include "RimEclipseInputProperty.h"
#include "RimEclipseInputPropertyCollection.h"
#include "cvfObject.h"
#include <QDir>
#include <QFile>
#include <QFileInfo>
@@ -24,7 +24,6 @@
#include "RigReservoirBuilder.h"
#include "cvfArray.h"
#include "cvfObject.h"
#include "cvfVector3.h"
class RigEclipseCaseData;
@@ -19,9 +19,7 @@
#pragma once
#include "cvfArray.h"
#include "cvfColor3.h"
#include "cvfObject.h"
#include "cvfVector3.h"
#include <memory>
#include <vector>
@@ -20,8 +20,6 @@
#include "RiaDefines.h"
#include "cvfVector3.h"
#include <QString>
#include <vector>
@@ -24,7 +24,6 @@
#include "cafAppEnum.h"
#include "cafVecIjk.h"
#include "cvfVector3.h"
#include <QString>
@@ -22,7 +22,6 @@
#include "cafVecIjk.h"
#include "cvfArray.h"
#include "cvfVector3.h"
#include <QString>
@@ -22,8 +22,6 @@
#include "RiaLogging.h"
#include "RigWellPath.h"
#include "cvfTrace.h"
#include "cafAssert.h"
//--------------------------------------------------------------------------------------------------
@@ -50,7 +50,6 @@
#include "cafVecIjk.h"
#include "cvfBoundingBox.h"
#include "cvfMath.h"
#include "cvfStructGrid.h"
#include <cmath>
@@ -41,7 +41,6 @@
#include "cafAssert.h"
#include "cafVecIjk.h"
#include "cvfMath.h"
#include "cvfStructGrid.h"
#include <algorithm>
@@ -22,8 +22,6 @@
#include "Well/RigWellPath.h"
#include "cvfObject.h"
TEST( RifOsduWellPathReader, ParseCsv )
{
std::string fileContent = R"(
@@ -22,8 +22,6 @@
#include "Well/RigWellLogCurveData.h"
#include "cvfVector3.h"
#include <vector>
#include <iostream>
@@ -17,8 +17,6 @@
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cvfObject.h"
#include <QPointer>
#include <QMouseEvent>
@@ -32,8 +32,6 @@
#include "RiuQwtPlotZoomer.h"
#include "RiuQwtSymbol.h"
#include "cvfColor3.h"
#include "cafCmdFeatureMenuBuilder.h"
#include "qwt_date.h"
@@ -23,8 +23,6 @@
#include "RigFlowDiagSolverInterface.h"
#include "cvfMath.h"
#include <QComboBox>
#include <QHBoxLayout>
#include <QLabel>
@@ -21,7 +21,6 @@
#include "cvfScalarMapperDiscreteLinear.h"
#include "cvfScalarMapperDiscreteLog.h"
#include "cvfString.h"
#include "cvfqtUtils.h"
#include <QFontMetrics>
@@ -22,7 +22,6 @@
#include "cafPdmUiNumberFormat.h"
#include "cvfObject.h"
#include "cvfRect.h"
#include "cvfScalarMapper.h"
#include <QLabel>