Janitor: Remove obsolete deleteChildren

Remove obsolete deleteChildren() in destructors. deleteChildren() is called in the destructor of PdmChildArrayField
This commit is contained in:
Magne Sjaastad
2024-07-25 13:58:31 +02:00
committed by GitHub
parent 34e30b38d3
commit 33ffa10ec9
71 changed files with 2 additions and 318 deletions

View File

@@ -78,14 +78,6 @@ RicExportToLasFileResampleUi::RicExportToLasFileResampleUi()
updateFieldVisibility();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicExportToLasFileResampleUi::~RicExportToLasFileResampleUi()
{
m_tvdrkbOffsets.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -53,7 +53,6 @@ public:
public:
RicExportToLasFileResampleUi();
~RicExportToLasFileResampleUi() override;
caf::PdmField<QString> exportFolder;
caf::PdmField<QString> filePrefix;

View File

@@ -47,14 +47,6 @@ RimOilFieldEntry::RimOilFieldEntry()
wells.uiCapability()->setUiTreeChildrenHidden( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimOilFieldEntry::~RimOilFieldEntry()
{
wells.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -30,7 +30,6 @@ class RimOilFieldEntry : public caf::PdmObject
public:
RimOilFieldEntry();
~RimOilFieldEntry() override;
caf::PdmField<QString> name;
caf::PdmField<QString> edmId;

View File

@@ -35,14 +35,6 @@ RimOilRegionEntry::RimOilRegionEntry()
CAF_PDM_InitField( &selected, "Selected", false, "Selected" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimOilRegionEntry::~RimOilRegionEntry()
{
fields.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -30,7 +30,6 @@ class RimOilRegionEntry : public caf::PdmObject
public:
RimOilRegionEntry();
~RimOilRegionEntry() override;
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField() override;

View File

@@ -103,11 +103,3 @@ void RimWellPathImport::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel
updateFieldVisibility();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellPathImport::~RimWellPathImport()
{
regions_OBSOLETE.deleteChildren();
}

View File

@@ -39,7 +39,6 @@ public:
public:
RimWellPathImport();
~RimWellPathImport() override;
caf::PdmField<caf::AppEnum<UtmFilterEnum>> utmFilterMode;
caf::PdmField<double> north;

View File

@@ -43,14 +43,6 @@ RimEclipsePropertyFilterCollection::RimEclipsePropertyFilterCollection()
CAF_PDM_InitFieldNoDefault( &m_propertyFilters, "PropertyFilters", "Property Filters" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipsePropertyFilterCollection::~RimEclipsePropertyFilterCollection()
{
m_propertyFilters.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -37,7 +37,6 @@ class RimEclipsePropertyFilterCollection : public RimPropertyFilterCollection
public:
RimEclipsePropertyFilterCollection();
~RimEclipsePropertyFilterCollection() override;
RimEclipseView* reservoirView();
void setIsDuplicatedFromLinkedView();

View File

@@ -39,14 +39,6 @@ RimGeoMechPropertyFilterCollection::RimGeoMechPropertyFilterCollection()
CAF_PDM_InitFieldNoDefault( &propertyFilters, "PropertyFilters", "Property Filters" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechPropertyFilterCollection::~RimGeoMechPropertyFilterCollection()
{
propertyFilters.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -38,7 +38,6 @@ class RimGeoMechPropertyFilterCollection : public RimPropertyFilterCollection
public:
RimGeoMechPropertyFilterCollection();
~RimGeoMechPropertyFilterCollection() override;
RimGeoMechView* reservoirView();

View File

@@ -44,14 +44,6 @@ Rim3dWellLogCurveCollection::Rim3dWellLogCurveCollection()
CAF_PDM_InitFieldNoDefault( &m_3dWellLogCurves, "ArrayOf3dWellLogCurves", "" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
Rim3dWellLogCurveCollection::~Rim3dWellLogCurveCollection()
{
m_3dWellLogCurves.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -37,7 +37,6 @@ class Rim3dWellLogCurveCollection : public caf::PdmObject
public:
Rim3dWellLogCurveCollection();
~Rim3dWellLogCurveCollection() override;
bool has3dWellLogCurves() const;
void add3dWellLogCurve( Rim3dWellLogCurve* curve );

View File

@@ -54,14 +54,6 @@ RimFractureTemplateCollection::RimFractureTemplateCollection()
m_nextValidFractureTemplateId.uiCapability()->setUiHidden( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFractureTemplateCollection::~RimFractureTemplateCollection()
{
m_fractureDefinitions.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -37,7 +37,6 @@ class RimFractureTemplateCollection : public caf::PdmObject
public:
RimFractureTemplateCollection();
~RimFractureTemplateCollection() override;
RimFractureTemplate* fractureTemplate( int id ) const;
std::vector<RimFractureTemplate*> fractureTemplates() const;

View File

@@ -55,14 +55,6 @@ RimPerforationCollection::RimPerforationCollection()
m_nonDarcyParameters.uiCapability()->setUiTreeChildrenHidden( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimPerforationCollection::~RimPerforationCollection()
{
m_perforations.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -40,7 +40,6 @@ class RimPerforationCollection : public RimCheckableNamedObject
public:
RimPerforationCollection();
~RimPerforationCollection() override;
bool hasPerforations() const;
const RimNonDarcyPerforationParameters* nonDarcyParameters() const;

View File

@@ -35,14 +35,6 @@ RimSimWellFractureCollection::RimSimWellFractureCollection()
setDeletable( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSimWellFractureCollection::~RimSimWellFractureCollection()
{
simwellFractures.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -34,7 +34,6 @@ class RimSimWellFractureCollection : public caf::PdmObject
public:
RimSimWellFractureCollection();
~RimSimWellFractureCollection() override;
caf::PdmChildArrayField<RimSimWellFracture*> simwellFractures;

View File

@@ -102,14 +102,6 @@ RimFaultInViewCollection::RimFaultInViewCollection()
m_showFaultsOutsideFilters_obsolete.uiCapability()->setUiHidden( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFaultInViewCollection::~RimFaultInViewCollection()
{
m_faults.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -52,7 +52,6 @@ public:
public:
RimFaultInViewCollection();
~RimFaultInViewCollection() override;
bool isActive() const;
void setActive( bool bActive );

View File

@@ -57,8 +57,6 @@ RimFlowPlotCollection::RimFlowPlotCollection()
RimFlowPlotCollection::~RimFlowPlotCollection()
{
delete m_defaultWellAllocPlot();
m_storedWellAllocPlots.deleteChildren();
}
//--------------------------------------------------------------------------------------------------

View File

@@ -79,15 +79,6 @@ RimIntersectionCollection::RimIntersectionCollection()
CAF_PDM_InitField( &m_applyCellFilters, "ApplyCellFilters", true, "Use Cell Filters for Intersections" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimIntersectionCollection::~RimIntersectionCollection()
{
m_intersections.deleteChildren();
m_intersectionBoxes.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -53,7 +53,6 @@ class RimIntersectionCollection : public caf::PdmObject
public:
RimIntersectionCollection();
~RimIntersectionCollection() override;
void appendIntersectionAndUpdate( RimExtrudedCurveIntersection* intersection, bool allowActiveViewChange = true );
void appendIntersectionNoUpdate( RimExtrudedCurveIntersection* intersection );

View File

@@ -35,14 +35,6 @@ RimCaseCollection::RimCaseCollection()
CAF_PDM_InitFieldNoDefault( &reservoirs, "Reservoirs", "Reservoirs ChildArrayField" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimCaseCollection::~RimCaseCollection()
{
reservoirs.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -36,11 +36,8 @@ class RimCaseCollection : public caf::PdmObject
public:
RimCaseCollection();
~RimCaseCollection() override;
caf::PdmChildArrayField<RimEclipseCase*> reservoirs;
RimIdenticalGridCaseGroup* parentCaseGroup();
RimEclipseCase* findByDescription( const QString& caseDescription ) const;
private:
};

View File

@@ -36,14 +36,6 @@ RimEclipseInputPropertyCollection::RimEclipseInputPropertyCollection()
CAF_PDM_InitFieldNoDefault( &inputProperties, "InputProperties", "" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseInputPropertyCollection::~RimEclipseInputPropertyCollection()
{
inputProperties.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
/// Returns the InputProperties pointing to the same file as \a fileName
//--------------------------------------------------------------------------------------------------

View File

@@ -39,7 +39,6 @@ class RimEclipseInputPropertyCollection : public caf::PdmObject
public:
RimEclipseInputPropertyCollection();
~RimEclipseInputPropertyCollection() override;
std::vector<RimEclipseInputProperty*> findInputProperties( QString fileName );
RimEclipseInputProperty* findInputProperty( QString resultName );

View File

@@ -510,8 +510,6 @@ RimEclipseResultCase::~RimEclipseResultCase()
{
if ( v ) v->setComparisonView( nullptr );
}
m_flowDiagSolutions.deleteChildren();
}
//--------------------------------------------------------------------------------------------------

View File

@@ -36,14 +36,6 @@ RimEclipseStatisticsCaseCollection::RimEclipseStatisticsCaseCollection()
CAF_PDM_InitFieldNoDefault( &cases, "Reservoirs", "" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseStatisticsCaseCollection::~RimEclipseStatisticsCaseCollection()
{
cases.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -40,7 +40,6 @@ class RimEclipseStatisticsCaseCollection : public caf::PdmObject
public:
RimEclipseStatisticsCaseCollection();
~RimEclipseStatisticsCaseCollection() override;
caf::PdmChildArrayField<RimEclipseStatisticsCase*> cases;

View File

@@ -36,14 +36,6 @@ RimFormationNamesCollection::RimFormationNamesCollection()
setDeletable( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFormationNamesCollection::~RimFormationNamesCollection()
{
m_formationNamesList.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -31,7 +31,6 @@ class RimFormationNamesCollection : public caf::PdmObject
public:
RimFormationNamesCollection();
~RimFormationNamesCollection() override;
const caf::PdmChildArrayField<RimFormationNames*>& formationNamesList() const { return m_formationNamesList; }

View File

@@ -58,16 +58,6 @@ RimObservedDataCollection::RimObservedDataCollection()
CAF_PDM_InitFieldNoDefault( &m_observedPressureDepthArray, "PressureDepthDataArray", "" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimObservedDataCollection::~RimObservedDataCollection()
{
m_observedDataArray.deleteChildren();
m_observedFmuRftArray.deleteChildren();
m_observedPressureDepthArray.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -34,7 +34,6 @@ class RimObservedDataCollection : public caf::PdmObject
public:
RimObservedDataCollection();
~RimObservedDataCollection() override;
void removeObservedSummaryData( RimObservedSummaryData* observedSummaryData );
void removeObservedFmuRftData( RimObservedFmuRftData* observedFmuRftData );

View File

@@ -44,14 +44,6 @@ RimPltPlotCollection::RimPltPlotCollection()
CAF_PDM_InitFieldNoDefault( &m_pltPlots, "PltPlots", "" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimPltPlotCollection::~RimPltPlotCollection()
{
m_pltPlots.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -50,7 +50,6 @@ class RimPltPlotCollection : public caf::PdmObject, public RimPlotCollection
public:
RimPltPlotCollection();
~RimPltPlotCollection() override;
RigEclipseWellLogExtractor* findOrCreateSimWellExtractor( const QString& simWellName,
const QString& caseUserDescription,

View File

@@ -58,14 +58,6 @@ RimReservoirCellResultsStorage::RimReservoirCellResultsStorage()
CAF_PDM_InitFieldNoDefault( &m_resultCacheMetaData, "ResultCacheEntries", "UiDummyname" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimReservoirCellResultsStorage::~RimReservoirCellResultsStorage()
{
m_resultCacheMetaData.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
/// This override populates the metainfo regarding the cell results data in the RigCaseCellResultsData
/// object. This metainfo will then be written to the project file when saving, and thus read on project file open.

View File

@@ -41,7 +41,6 @@ class RimReservoirCellResultsStorage : public caf::PdmObject
public:
RimReservoirCellResultsStorage();
~RimReservoirCellResultsStorage() override;
void setCellResults( RigCaseCellResultsData* cellResults );

View File

@@ -44,14 +44,6 @@ RimRftPlotCollection::RimRftPlotCollection()
CAF_PDM_InitFieldNoDefault( &m_rftPlots, "RftPlots", "" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimRftPlotCollection::~RimRftPlotCollection()
{
m_rftPlots.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -50,7 +50,6 @@ class RimRftPlotCollection : public caf::PdmObject, public RimPlotCollection
public:
RimRftPlotCollection();
~RimRftPlotCollection() override;
RigEclipseWellLogExtractor* findOrCreateSimWellExtractor( const QString& simWellName,
const QString& caseUserDescription,

View File

@@ -45,15 +45,6 @@ RimScriptCollection::RimScriptCollection()
CAF_PDM_InitFieldNoDefault( &subDirectories, "SubDirectories", "" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimScriptCollection::~RimScriptCollection()
{
calcScripts.deleteChildren();
subDirectories.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -41,7 +41,6 @@ class RimScriptCollection : public caf::PdmObject
public:
RimScriptCollection();
~RimScriptCollection() override;
public:
caf::PdmField<QString> directory;

View File

@@ -233,14 +233,6 @@ RimSimWellInViewCollection::RimSimWellInViewCollection()
m_reservoirView = nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSimWellInViewCollection::~RimSimWellInViewCollection()
{
wells.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -44,7 +44,6 @@ class RimSimWellInViewCollection : public caf::PdmObject
public:
RimSimWellInViewCollection();
~RimSimWellInViewCollection() override;
void setReservoirView( RimEclipseView* ownerReservoirView );

View File

@@ -37,14 +37,6 @@ RimElasticPropertyScalingCollection::RimElasticPropertyScalingCollection()
CAF_PDM_InitScriptableFieldNoDefault( &m_elasticPropertyScalings, "ElasticPropertyScalings", "Elastic Property Scalings" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimElasticPropertyScalingCollection::~RimElasticPropertyScalingCollection()
{
m_elasticPropertyScalings.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -36,7 +36,6 @@ class RimElasticPropertyScalingCollection : public caf::PdmObject
public:
RimElasticPropertyScalingCollection();
~RimElasticPropertyScalingCollection() override;
caf::Signal<> changed;

View File

@@ -35,14 +35,6 @@ RimStimPlanModelPlotCollection::RimStimPlanModelPlotCollection()
CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModelPlots, "StimPlanModelPlots", "" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimStimPlanModelPlotCollection::~RimStimPlanModelPlotCollection()
{
m_stimPlanModelPlots.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -36,7 +36,6 @@ class RimStimPlanModelPlotCollection : public caf::PdmObject, public RimPlotColl
public:
RimStimPlanModelPlotCollection();
~RimStimPlanModelPlotCollection() override;
void addStimPlanModelPlot( RimStimPlanModelPlot* newPlot );

View File

@@ -44,14 +44,6 @@ RimStimPlanModelTemplateCollection::RimStimPlanModelTemplateCollection()
m_nextValidId.uiCapability()->setUiHidden( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimStimPlanModelTemplateCollection::~RimStimPlanModelTemplateCollection()
{
m_stimPlanModelTemplates.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -34,7 +34,6 @@ class RimStimPlanModelTemplateCollection : public caf::PdmObject
public:
RimStimPlanModelTemplateCollection();
~RimStimPlanModelTemplateCollection() override;
RimStimPlanModelTemplate* stimPlanModelTemplate( int id ) const;
std::vector<RimStimPlanModelTemplate*> stimPlanModelTemplates() const;

View File

@@ -54,14 +54,6 @@ RimEnsembleCurveSetCollection::RimEnsembleCurveSetCollection()
m_ySourceStepping.xmlCapability()->disableIO();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEnsembleCurveSetCollection::~RimEnsembleCurveSetCollection()
{
m_curveSets.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -38,7 +38,6 @@ class RimEnsembleCurveSetCollection : public caf::PdmObject
public:
RimEnsembleCurveSetCollection();
~RimEnsembleCurveSetCollection() override;
bool isCurveSetsVisible() const;

View File

@@ -65,14 +65,6 @@ RimSummaryCurveCollection::RimSummaryCurveCollection()
m_ySourceStepping.xmlCapability()->disableIO();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCurveCollection::~RimSummaryCurveCollection()
{
m_curves.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -45,7 +45,6 @@ private:
public:
RimSummaryCurveCollection();
~RimSummaryCurveCollection() override;
bool isCurvesVisible();

View File

@@ -34,14 +34,6 @@ RimEnsembleWellLogsCollection::RimEnsembleWellLogsCollection()
CAF_PDM_InitFieldNoDefault( &m_ensembleWellLogs, "EnsembleWellLogsCollection", "" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEnsembleWellLogsCollection::~RimEnsembleWellLogsCollection()
{
m_ensembleWellLogs.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -31,7 +31,6 @@ class RimEnsembleWellLogsCollection : public caf::PdmObject
public:
RimEnsembleWellLogsCollection();
~RimEnsembleWellLogsCollection() override;
std::vector<RimEnsembleWellLogs*> ensembleWellLogs() const;

View File

@@ -53,14 +53,6 @@ RimOsduWellLog::RimOsduWellLog()
setDeletable( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimOsduWellLog::~RimOsduWellLog()
{
m_wellLogChannels.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -44,7 +44,6 @@ class RimOsduWellLog : public RimWellLog
public:
RimOsduWellLog();
~RimOsduWellLog() override;
void setName( const QString& name );
QString name() const override;

View File

@@ -51,14 +51,6 @@ RimWellLogCsvFile::RimWellLogCsvFile()
m_wellLogDataFile = nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogCsvFile::~RimWellLogCsvFile()
{
m_wellLogChannels.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -41,7 +41,6 @@ class RimWellLogCsvFile : public RimWellLogFile
public:
RimWellLogCsvFile();
~RimWellLogCsvFile() override;
QString name() const override { return m_name; }

View File

@@ -82,14 +82,6 @@ RimWellLogLasFile::RimWellLogLasFile()
m_lasFileHasValidDate = false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellLogLasFile::~RimWellLogLasFile()
{
m_wellLogChannels.deleteChildren();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -44,7 +44,6 @@ class RimWellLogLasFile : public RimWellLogFile
public:
RimWellLogLasFile();
~RimWellLogLasFile() override;
static RimWellLogLasFile* readWellLogFile( const QString& logFilePath, QString* errorMessage );

View File

@@ -201,8 +201,6 @@ public:
"Whatsthis SimpleObjectsField" );
}
~InheritedDemoObj() { m_simpleObjectsField.deleteChildren(); }
caf::PdmField<std::vector<QString>> m_texts;
caf::PdmField<std::vector<double>> m_numbers;
@@ -222,8 +220,6 @@ public:
CAF_PDM_InitFieldNoDefault( &objects, "PdmObjects", "", "", "", "" )
}
~MyPdmDocument() { objects.deleteChildren(); }
caf::PdmChildArrayField<PdmObjectHandle*> objects;
};
CAF_PDM_SOURCE_INIT( MyPdmDocument, "MyPdmDocument" );

View File

@@ -10,7 +10,6 @@ Parent::Parent()
Parent::~Parent()
{
delete m_simpleObjectF();
m_simpleObjectsField.deleteChildren();
}
void Parent::doSome()

View File

@@ -66,12 +66,6 @@ public:
this->addField( &derivedOtherObjs, "derivedOtherObjs" );
}
~ContainerObj()
{
derivedObjs.deleteChildren();
derivedOtherObjs.deleteChildren();
}
caf::PdmChildArrayField<SimpleObjDerived*> derivedObjs;
caf::PdmChildArrayField<SimpleObjDerivedOther*> derivedOtherObjs;
};

View File

@@ -53,11 +53,7 @@ public:
this->addField( &m_simpleObjPtrField, "m_simpleObjPtrField" );
}
~ReferenceSimpleObj()
{
delete m_pointersField();
m_simpleObjPtrField.deleteChildren();
}
~ReferenceSimpleObj() { delete m_pointersField(); }
// Fields
caf::PdmChildField<PdmObjectHandle*> m_pointersField;

View File

@@ -189,8 +189,6 @@ public:
CAF_PDM_XML_InitField( &m_childArrayField, "DemoPdmObjectects" );
}
~InheritedDemoObj() { m_childArrayField.deleteChildren(); }
caf::PdmDataValueField<QString> m_texts;
caf::PdmChildArrayField<DemoPdmObject*> m_childArrayField;
};
@@ -254,11 +252,7 @@ public:
CAF_PDM_XML_InitField( &m_simpleObjPtrField2, "SimpleObjPtrField2" );
}
~ReferenceDemoPdmObject()
{
delete m_pointersField();
m_simpleObjPtrField2.deleteChildren();
}
~ReferenceDemoPdmObject() { delete m_pointersField(); }
// Fields
caf::PdmChildField<PdmObjectHandle*> m_pointersField;

View File

@@ -193,8 +193,6 @@ public:
"Whatsthis SimpleObjectsField" );
}
~InheritedDemoObj() { m_simpleObjectsField.deleteChildren(); }
caf::PdmField<std::vector<QString>> m_texts;
caf::PdmField<caf::AppEnum<TestEnumType>> m_testEnumField;
caf::PdmChildArrayField<SimpleObj*> m_simpleObjectsField;
@@ -212,8 +210,6 @@ public:
CAF_PDM_InitFieldNoDefault( &objects, "PdmObjects", "", "", "", "" )
}
~MyPdmDocument() { objects.deleteChildren(); }
caf::PdmChildArrayField<PdmObjectHandle*> objects;
};
CAF_PDM_SOURCE_INIT( MyPdmDocument, "MyPdmDocument" );

View File

@@ -37,8 +37,6 @@ public:
m_simpleObjPtrField.uiCapability()->setUiTreeHidden( false );
}
~DemoPdmObject() { m_simpleObjPtrField.deleteChildren(); }
caf::PdmChildArrayField<caf::PdmObjectHandle*> m_simpleObjPtrField;
};