From 43e38d8aff07e4ed611f71eb51539c53c9f8423f Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 25 Aug 2022 11:30:15 +0200 Subject: [PATCH] Remove unused members and remove includes --- .../Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.h | 1 - .../Intersections/RimExtrudedCurveIntersection.h | 1 - .../ProjectDataModel/Summary/RimEnsembleCurveSet.h | 1 - .../ProjectDataModel/Summary/RimSummaryCurveCollection.h | 1 - .../ProjectDataModel/Summary/RimSummaryMultiPlot.h | 1 - .../ProjectDataModel/Summary/RimSummaryPlot.h | 1 - .../ProjectDataModel/Summary/RimSummaryPlotCollection.h | 1 - .../ProjectDataModelCommands/RimcElasticProperties.h | 1 - .../ProjectDataModelCommands/RimcStimPlanModel.h | 1 - .../ProjectDataModelCommands/RimcStimPlanModelCollection.h | 1 - .../RimcStimPlanModelPlotCollection.h | 1 - .../RimcStimPlanModelTemplateCollection.h | 1 - .../ProjectDataModelCommands/RimcSurfaceCollection.h | 1 - .../ProjectDataModelCommands/RimcWellLogPlot.h | 1 - .../ProjectDataModelCommands/RimcWellLogPlotCollection.h | 1 - .../ProjectDataModelCommands/RimcWellLogTrack.h | 1 - .../cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.h | 7 +------ 17 files changed, 1 insertion(+), 22 deletions(-) diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.h b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.h index ec027b8721..dfa5fce41f 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.h +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.h @@ -28,7 +28,6 @@ #include "cafPdmObject.h" #include "cafPdmPointer.h" #include "cafPdmProxyValueField.h" -#include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" #include diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.h b/ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.h index be726af8db..8e2bbf2d1f 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.h +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.h @@ -25,7 +25,6 @@ #include "cafPdmChildField.h" #include "cafPdmProxyValueField.h" -#include "cafPdmPtrArrayField.h" class RimWellPath; class RivExtrudedCurveIntersectionPartMgr; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h index 27056ab436..8ac2b87b40 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h @@ -43,7 +43,6 @@ #include "cafPdmFieldCvfColor.h" #include "cafPdmObject.h" #include "cafPdmProxyValueField.h" -#include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" #include diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h index 988aea3e02..952ecbf9fc 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h @@ -24,7 +24,6 @@ #include "cafPdmChildField.h" #include "cafPdmField.h" #include "cafPdmObject.h" -#include "cafPdmPtrArrayField.h" class RimSummaryCase; class RimSummaryCurve; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h index 66357d832d..fafb7b49e4 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.h @@ -23,7 +23,6 @@ #include "cafPdmChildField.h" #include "cafPdmObject.h" -#include "cafPdmPtrArrayField.h" #include "cafPdmUiItem.h" #include "cafSignal.h" diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h index fa79ba1b63..640a51293a 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h @@ -32,7 +32,6 @@ #include "cafPdmChildArrayField.h" #include "cafPdmObjectHandle.h" #include "cafPdmProxyValueField.h" -#include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" #include diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h index 93ce7f6ec9..6e8de40312 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h @@ -23,7 +23,6 @@ #include "cafPdmChildArrayField.h" #include "cafPdmObject.h" -#include "cafPdmPtrArrayField.h" class RimSummaryPlot; diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcElasticProperties.h b/ApplicationLibCode/ProjectDataModelCommands/RimcElasticProperties.h index f1ea4b5ed0..6df8ce757f 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcElasticProperties.h +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcElasticProperties.h @@ -23,7 +23,6 @@ #include "cafPdmField.h" #include "cafPdmObjectHandle.h" #include "cafPdmObjectMethod.h" -#include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" #include diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModel.h b/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModel.h index db8edc8a97..9b343c2257 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModel.h +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModel.h @@ -21,7 +21,6 @@ #include "cafPdmField.h" #include "cafPdmObjectHandle.h" #include "cafPdmObjectMethod.h" -#include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" #include diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.h b/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.h index 87665ccb3f..0188ff2a29 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.h +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.h @@ -23,7 +23,6 @@ #include "cafPdmField.h" #include "cafPdmObjectHandle.h" #include "cafPdmObjectMethod.h" -#include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" #include diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelPlotCollection.h b/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelPlotCollection.h index bb41d5dd31..104470bb1a 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelPlotCollection.h +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelPlotCollection.h @@ -23,7 +23,6 @@ #include "cafPdmField.h" #include "cafPdmObjectHandle.h" #include "cafPdmObjectMethod.h" -#include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" class RimStimPlanModel; diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.h b/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.h index 19a10e7c24..c7b64576f3 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.h +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.h @@ -23,7 +23,6 @@ #include "cafPdmField.h" #include "cafPdmObjectHandle.h" #include "cafPdmObjectMethod.h" -#include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" #include diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcSurfaceCollection.h b/ApplicationLibCode/ProjectDataModelCommands/RimcSurfaceCollection.h index 40e4b5f0ff..e46a5ec98e 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcSurfaceCollection.h +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcSurfaceCollection.h @@ -23,7 +23,6 @@ #include "cafPdmField.h" #include "cafPdmObjectHandle.h" #include "cafPdmObjectMethod.h" -#include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" #include diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcWellLogPlot.h b/ApplicationLibCode/ProjectDataModelCommands/RimcWellLogPlot.h index 4c38a9da9b..cd18a1bc3c 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcWellLogPlot.h +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcWellLogPlot.h @@ -23,7 +23,6 @@ #include "cafPdmField.h" #include "cafPdmObjectHandle.h" #include "cafPdmObjectMethod.h" -#include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" class RimEclipseCase; diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcWellLogPlotCollection.h b/ApplicationLibCode/ProjectDataModelCommands/RimcWellLogPlotCollection.h index f31c3cc2c5..1b7c02a4cc 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcWellLogPlotCollection.h +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcWellLogPlotCollection.h @@ -23,7 +23,6 @@ #include "cafPdmField.h" #include "cafPdmObjectHandle.h" #include "cafPdmObjectMethod.h" -#include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" class RimStimPlanModel; diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcWellLogTrack.h b/ApplicationLibCode/ProjectDataModelCommands/RimcWellLogTrack.h index b7cead3bee..4b42821206 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcWellLogTrack.h +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcWellLogTrack.h @@ -23,7 +23,6 @@ #include "cafPdmField.h" #include "cafPdmObjectHandle.h" #include "cafPdmObjectMethod.h" -#include "cafPdmPtrArrayField.h" #include "cafPdmPtrField.h" class RimEclipseCase; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.h index c1e1b734d8..a1a7453916 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.h @@ -35,10 +35,7 @@ class PdmPtrArrayField : public PdmPtrArrayFieldHandle public: typedef std::vector> FieldDataType; - PdmPtrArrayField() - : m_isResolved( false ) - { - } + PdmPtrArrayField() {} virtual ~PdmPtrArrayField(); PdmPtrArrayField& operator()() { return *this; } @@ -91,8 +88,6 @@ private: friend class PdmFieldXmlCap>; std::vector> m_pointers; - QString m_referenceString; - bool m_isResolved; }; } // End of namespace caf