diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp index c2dfb84fa1..9c5d9c5c87 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp @@ -78,14 +78,6 @@ RicExportToLasFileResampleUi::RicExportToLasFileResampleUi() updateFieldVisibility(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RicExportToLasFileResampleUi::~RicExportToLasFileResampleUi() -{ - m_tvdrkbOffsets.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.h b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.h index 054ac0c58b..70c253a204 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.h +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.h @@ -53,7 +53,6 @@ public: public: RicExportToLasFileResampleUi(); - ~RicExportToLasFileResampleUi() override; caf::PdmField exportFolder; caf::PdmField filePrefix; diff --git a/ApplicationLibCode/Commands/OsduImportCommands/RimOilFieldEntry.cpp b/ApplicationLibCode/Commands/OsduImportCommands/RimOilFieldEntry.cpp index 53c310dd79..e3410cb72d 100644 --- a/ApplicationLibCode/Commands/OsduImportCommands/RimOilFieldEntry.cpp +++ b/ApplicationLibCode/Commands/OsduImportCommands/RimOilFieldEntry.cpp @@ -47,14 +47,6 @@ RimOilFieldEntry::RimOilFieldEntry() wells.uiCapability()->setUiTreeChildrenHidden( true ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimOilFieldEntry::~RimOilFieldEntry() -{ - wells.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/OsduImportCommands/RimOilFieldEntry.h b/ApplicationLibCode/Commands/OsduImportCommands/RimOilFieldEntry.h index 08278a52dd..b0c71c6706 100644 --- a/ApplicationLibCode/Commands/OsduImportCommands/RimOilFieldEntry.h +++ b/ApplicationLibCode/Commands/OsduImportCommands/RimOilFieldEntry.h @@ -30,7 +30,6 @@ class RimOilFieldEntry : public caf::PdmObject public: RimOilFieldEntry(); - ~RimOilFieldEntry() override; caf::PdmField name; caf::PdmField edmId; diff --git a/ApplicationLibCode/Commands/OsduImportCommands/RimOilRegionEntry.cpp b/ApplicationLibCode/Commands/OsduImportCommands/RimOilRegionEntry.cpp index 7a3b7b355b..bc8875233b 100644 --- a/ApplicationLibCode/Commands/OsduImportCommands/RimOilRegionEntry.cpp +++ b/ApplicationLibCode/Commands/OsduImportCommands/RimOilRegionEntry.cpp @@ -35,14 +35,6 @@ RimOilRegionEntry::RimOilRegionEntry() CAF_PDM_InitField( &selected, "Selected", false, "Selected" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimOilRegionEntry::~RimOilRegionEntry() -{ - fields.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/OsduImportCommands/RimOilRegionEntry.h b/ApplicationLibCode/Commands/OsduImportCommands/RimOilRegionEntry.h index 9a564086d5..897286bb56 100644 --- a/ApplicationLibCode/Commands/OsduImportCommands/RimOilRegionEntry.h +++ b/ApplicationLibCode/Commands/OsduImportCommands/RimOilRegionEntry.h @@ -30,7 +30,6 @@ class RimOilRegionEntry : public caf::PdmObject public: RimOilRegionEntry(); - ~RimOilRegionEntry() override; caf::PdmFieldHandle* userDescriptionField() override; caf::PdmFieldHandle* objectToggleField() override; diff --git a/ApplicationLibCode/Commands/OsduImportCommands/RimWellPathImport.cpp b/ApplicationLibCode/Commands/OsduImportCommands/RimWellPathImport.cpp index b384171f4f..f78dc3edc9 100644 --- a/ApplicationLibCode/Commands/OsduImportCommands/RimWellPathImport.cpp +++ b/ApplicationLibCode/Commands/OsduImportCommands/RimWellPathImport.cpp @@ -103,11 +103,3 @@ void RimWellPathImport::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel updateFieldVisibility(); } } - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimWellPathImport::~RimWellPathImport() -{ - regions_OBSOLETE.deleteChildren(); -} diff --git a/ApplicationLibCode/Commands/OsduImportCommands/RimWellPathImport.h b/ApplicationLibCode/Commands/OsduImportCommands/RimWellPathImport.h index bb4ad472a9..abaf3f0a09 100644 --- a/ApplicationLibCode/Commands/OsduImportCommands/RimWellPathImport.h +++ b/ApplicationLibCode/Commands/OsduImportCommands/RimWellPathImport.h @@ -39,7 +39,6 @@ public: public: RimWellPathImport(); - ~RimWellPathImport() override; caf::PdmField> utmFilterMode; caf::PdmField north; diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp index 231d522db8..3774fedfa0 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp @@ -43,14 +43,6 @@ RimEclipsePropertyFilterCollection::RimEclipsePropertyFilterCollection() CAF_PDM_InitFieldNoDefault( &m_propertyFilters, "PropertyFilters", "Property Filters" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimEclipsePropertyFilterCollection::~RimEclipsePropertyFilterCollection() -{ - m_propertyFilters.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.h b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.h index 00035095b8..594c070c13 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.h +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.h @@ -37,7 +37,6 @@ class RimEclipsePropertyFilterCollection : public RimPropertyFilterCollection public: RimEclipsePropertyFilterCollection(); - ~RimEclipsePropertyFilterCollection() override; RimEclipseView* reservoirView(); void setIsDuplicatedFromLinkedView(); diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.cpp index 432025ca8f..7b24077c07 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.cpp @@ -39,14 +39,6 @@ RimGeoMechPropertyFilterCollection::RimGeoMechPropertyFilterCollection() CAF_PDM_InitFieldNoDefault( &propertyFilters, "PropertyFilters", "Property Filters" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimGeoMechPropertyFilterCollection::~RimGeoMechPropertyFilterCollection() -{ - propertyFilters.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.h b/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.h index 4bedbff51c..5b9bf413fb 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.h +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.h @@ -38,7 +38,6 @@ class RimGeoMechPropertyFilterCollection : public RimPropertyFilterCollection public: RimGeoMechPropertyFilterCollection(); - ~RimGeoMechPropertyFilterCollection() override; RimGeoMechView* reservoirView(); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp index 920664f8c8..c7564e1c5d 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp @@ -44,14 +44,6 @@ Rim3dWellLogCurveCollection::Rim3dWellLogCurveCollection() CAF_PDM_InitFieldNoDefault( &m_3dWellLogCurves, "ArrayOf3dWellLogCurves", "" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -Rim3dWellLogCurveCollection::~Rim3dWellLogCurveCollection() -{ - m_3dWellLogCurves.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.h b/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.h index d53153b484..16190587aa 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.h @@ -37,7 +37,6 @@ class Rim3dWellLogCurveCollection : public caf::PdmObject public: Rim3dWellLogCurveCollection(); - ~Rim3dWellLogCurveCollection() override; bool has3dWellLogCurves() const; void add3dWellLogCurve( Rim3dWellLogCurve* curve ); diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp index 9a1b4c8605..be51962b32 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp @@ -54,14 +54,6 @@ RimFractureTemplateCollection::RimFractureTemplateCollection() m_nextValidFractureTemplateId.uiCapability()->setUiHidden( true ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimFractureTemplateCollection::~RimFractureTemplateCollection() -{ - m_fractureDefinitions.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h index b8681eb64a..2729aee506 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.h @@ -37,7 +37,6 @@ class RimFractureTemplateCollection : public caf::PdmObject public: RimFractureTemplateCollection(); - ~RimFractureTemplateCollection() override; RimFractureTemplate* fractureTemplate( int id ) const; std::vector fractureTemplates() const; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp index eb72cc800f..2a2c0483b4 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp @@ -55,14 +55,6 @@ RimPerforationCollection::RimPerforationCollection() m_nonDarcyParameters.uiCapability()->setUiTreeChildrenHidden( true ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimPerforationCollection::~RimPerforationCollection() -{ - m_perforations.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.h b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.h index b8db71201a..bc9e6c4074 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.h @@ -40,7 +40,6 @@ class RimPerforationCollection : public RimCheckableNamedObject public: RimPerforationCollection(); - ~RimPerforationCollection() override; bool hasPerforations() const; const RimNonDarcyPerforationParameters* nonDarcyParameters() const; diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp index 627f50bfc8..f3664e4a2a 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp @@ -35,14 +35,6 @@ RimSimWellFractureCollection::RimSimWellFractureCollection() setDeletable( true ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimSimWellFractureCollection::~RimSimWellFractureCollection() -{ - simwellFractures.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.h b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.h index 28d646e768..d262139bca 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.h @@ -34,7 +34,6 @@ class RimSimWellFractureCollection : public caf::PdmObject public: RimSimWellFractureCollection(); - ~RimSimWellFractureCollection() override; caf::PdmChildArrayField simwellFractures; diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp index d203a33482..f8143e5c5e 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp @@ -102,14 +102,6 @@ RimFaultInViewCollection::RimFaultInViewCollection() m_showFaultsOutsideFilters_obsolete.uiCapability()->setUiHidden( true ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimFaultInViewCollection::~RimFaultInViewCollection() -{ - m_faults.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.h index 374d37fc32..0365c9fa5c 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.h @@ -52,7 +52,6 @@ public: public: RimFaultInViewCollection(); - ~RimFaultInViewCollection() override; bool isActive() const; void setActive( bool bActive ); diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp index 6c11e5468d..a673ecae8d 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp @@ -57,8 +57,6 @@ RimFlowPlotCollection::RimFlowPlotCollection() RimFlowPlotCollection::~RimFlowPlotCollection() { delete m_defaultWellAllocPlot(); - - m_storedWellAllocPlots.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp index 8781b96c4f..fad6e63760 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp @@ -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(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.h b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.h index 7e6eb07ee8..697f749543 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.h @@ -53,7 +53,6 @@ class RimIntersectionCollection : public caf::PdmObject public: RimIntersectionCollection(); - ~RimIntersectionCollection() override; void appendIntersectionAndUpdate( RimExtrudedCurveIntersection* intersection, bool allowActiveViewChange = true ); void appendIntersectionNoUpdate( RimExtrudedCurveIntersection* intersection ); diff --git a/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp index 73d94d2748..4a90f23926 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp @@ -35,14 +35,6 @@ RimCaseCollection::RimCaseCollection() CAF_PDM_InitFieldNoDefault( &reservoirs, "Reservoirs", "Reservoirs ChildArrayField" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimCaseCollection::~RimCaseCollection() -{ - reservoirs.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimCaseCollection.h b/ApplicationLibCode/ProjectDataModel/RimCaseCollection.h index a85fe393b4..56d7052a83 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCaseCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimCaseCollection.h @@ -36,11 +36,8 @@ class RimCaseCollection : public caf::PdmObject public: RimCaseCollection(); - ~RimCaseCollection() override; caf::PdmChildArrayField reservoirs; RimIdenticalGridCaseGroup* parentCaseGroup(); RimEclipseCase* findByDescription( const QString& caseDescription ) const; - -private: }; diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp index b261ec1166..0d4aa4aeaf 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp @@ -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 //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.h b/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.h index 7e6e2e8516..f5eae1cd8a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.h @@ -39,7 +39,6 @@ class RimEclipseInputPropertyCollection : public caf::PdmObject public: RimEclipseInputPropertyCollection(); - ~RimEclipseInputPropertyCollection() override; std::vector findInputProperties( QString fileName ); RimEclipseInputProperty* findInputProperty( QString resultName ); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp index 2ad964e321..28604204a3 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -510,8 +510,6 @@ RimEclipseResultCase::~RimEclipseResultCase() { if ( v ) v->setComparisonView( nullptr ); } - - m_flowDiagSolutions.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp index 55b5f12057..087507928c 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp @@ -36,14 +36,6 @@ RimEclipseStatisticsCaseCollection::RimEclipseStatisticsCaseCollection() CAF_PDM_InitFieldNoDefault( &cases, "Reservoirs", "" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimEclipseStatisticsCaseCollection::~RimEclipseStatisticsCaseCollection() -{ - cases.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.h b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.h index fcf5eef8b1..e8bb28c12b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.h @@ -40,7 +40,6 @@ class RimEclipseStatisticsCaseCollection : public caf::PdmObject public: RimEclipseStatisticsCaseCollection(); - ~RimEclipseStatisticsCaseCollection() override; caf::PdmChildArrayField cases; diff --git a/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp index 3925ea453c..f9b7f14a4f 100644 --- a/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp @@ -36,14 +36,6 @@ RimFormationNamesCollection::RimFormationNamesCollection() setDeletable( true ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimFormationNamesCollection::~RimFormationNamesCollection() -{ - m_formationNamesList.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.h b/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.h index 21f5aa6888..1a3f165da7 100644 --- a/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.h @@ -31,7 +31,6 @@ class RimFormationNamesCollection : public caf::PdmObject public: RimFormationNamesCollection(); - ~RimFormationNamesCollection() override; const caf::PdmChildArrayField& formationNamesList() const { return m_formationNamesList; } diff --git a/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp index 73dabb85e8..b3649ae8d0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp @@ -58,16 +58,6 @@ RimObservedDataCollection::RimObservedDataCollection() CAF_PDM_InitFieldNoDefault( &m_observedPressureDepthArray, "PressureDepthDataArray", "" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimObservedDataCollection::~RimObservedDataCollection() -{ - m_observedDataArray.deleteChildren(); - m_observedFmuRftArray.deleteChildren(); - m_observedPressureDepthArray.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.h b/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.h index 3b2bee93b7..c6b573c782 100644 --- a/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.h @@ -34,7 +34,6 @@ class RimObservedDataCollection : public caf::PdmObject public: RimObservedDataCollection(); - ~RimObservedDataCollection() override; void removeObservedSummaryData( RimObservedSummaryData* observedSummaryData ); void removeObservedFmuRftData( RimObservedFmuRftData* observedFmuRftData ); diff --git a/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.cpp index 3b7a0deb49..2d29e8a557 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.cpp @@ -44,14 +44,6 @@ RimPltPlotCollection::RimPltPlotCollection() CAF_PDM_InitFieldNoDefault( &m_pltPlots, "PltPlots", "" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimPltPlotCollection::~RimPltPlotCollection() -{ - m_pltPlots.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.h b/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.h index 60a59e477d..320a219778 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.h @@ -50,7 +50,6 @@ class RimPltPlotCollection : public caf::PdmObject, public RimPlotCollection public: RimPltPlotCollection(); - ~RimPltPlotCollection() override; RigEclipseWellLogExtractor* findOrCreateSimWellExtractor( const QString& simWellName, const QString& caseUserDescription, diff --git a/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp b/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp index bfa24e1397..1a8402f9fc 100644 --- a/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp @@ -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. diff --git a/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.h b/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.h index 51caa35521..8643a08212 100644 --- a/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.h +++ b/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.h @@ -41,7 +41,6 @@ class RimReservoirCellResultsStorage : public caf::PdmObject public: RimReservoirCellResultsStorage(); - ~RimReservoirCellResultsStorage() override; void setCellResults( RigCaseCellResultsData* cellResults ); diff --git a/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.cpp index d827dabcbc..12bf81457a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.cpp @@ -44,14 +44,6 @@ RimRftPlotCollection::RimRftPlotCollection() CAF_PDM_InitFieldNoDefault( &m_rftPlots, "RftPlots", "" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimRftPlotCollection::~RimRftPlotCollection() -{ - m_rftPlots.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.h b/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.h index 7c015ff047..90be5310f3 100644 --- a/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.h @@ -50,7 +50,6 @@ class RimRftPlotCollection : public caf::PdmObject, public RimPlotCollection public: RimRftPlotCollection(); - ~RimRftPlotCollection() override; RigEclipseWellLogExtractor* findOrCreateSimWellExtractor( const QString& simWellName, const QString& caseUserDescription, diff --git a/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp index b2ba21531b..dd21f5bbe7 100644 --- a/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp @@ -45,15 +45,6 @@ RimScriptCollection::RimScriptCollection() CAF_PDM_InitFieldNoDefault( &subDirectories, "SubDirectories", "" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimScriptCollection::~RimScriptCollection() -{ - calcScripts.deleteChildren(); - subDirectories.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimScriptCollection.h b/ApplicationLibCode/ProjectDataModel/RimScriptCollection.h index 432fa82dba..817a34375d 100644 --- a/ApplicationLibCode/ProjectDataModel/RimScriptCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimScriptCollection.h @@ -41,7 +41,6 @@ class RimScriptCollection : public caf::PdmObject public: RimScriptCollection(); - ~RimScriptCollection() override; public: caf::PdmField directory; diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp index 00519da768..cf14080a43 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp @@ -233,14 +233,6 @@ RimSimWellInViewCollection::RimSimWellInViewCollection() m_reservoirView = nullptr; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimSimWellInViewCollection::~RimSimWellInViewCollection() -{ - wells.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.h b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.h index b767e0ad69..2fa2a50b56 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.h @@ -44,7 +44,6 @@ class RimSimWellInViewCollection : public caf::PdmObject public: RimSimWellInViewCollection(); - ~RimSimWellInViewCollection() override; void setReservoirView( RimEclipseView* ownerReservoirView ); diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.cpp index 9b504765ec..016bda07b7 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.cpp @@ -37,14 +37,6 @@ RimElasticPropertyScalingCollection::RimElasticPropertyScalingCollection() CAF_PDM_InitScriptableFieldNoDefault( &m_elasticPropertyScalings, "ElasticPropertyScalings", "Elastic Property Scalings" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimElasticPropertyScalingCollection::~RimElasticPropertyScalingCollection() -{ - m_elasticPropertyScalings.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.h b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.h index ba6077bf85..87cbb1bcb8 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.h +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.h @@ -36,7 +36,6 @@ class RimElasticPropertyScalingCollection : public caf::PdmObject public: RimElasticPropertyScalingCollection(); - ~RimElasticPropertyScalingCollection() override; caf::Signal<> changed; diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp index da70a84418..4be57666bc 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp @@ -35,14 +35,6 @@ RimStimPlanModelPlotCollection::RimStimPlanModelPlotCollection() CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModelPlots, "StimPlanModelPlots", "" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimStimPlanModelPlotCollection::~RimStimPlanModelPlotCollection() -{ - m_stimPlanModelPlots.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.h b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.h index 9f273e4e8e..b9d4008efc 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.h +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.h @@ -36,7 +36,6 @@ class RimStimPlanModelPlotCollection : public caf::PdmObject, public RimPlotColl public: RimStimPlanModelPlotCollection(); - ~RimStimPlanModelPlotCollection() override; void addStimPlanModelPlot( RimStimPlanModelPlot* newPlot ); diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp index b024a6e570..a4d60b63f3 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp @@ -44,14 +44,6 @@ RimStimPlanModelTemplateCollection::RimStimPlanModelTemplateCollection() m_nextValidId.uiCapability()->setUiHidden( true ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimStimPlanModelTemplateCollection::~RimStimPlanModelTemplateCollection() -{ - m_stimPlanModelTemplates.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.h b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.h index 7d3e1328a9..b48e11b300 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.h +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.h @@ -34,7 +34,6 @@ class RimStimPlanModelTemplateCollection : public caf::PdmObject public: RimStimPlanModelTemplateCollection(); - ~RimStimPlanModelTemplateCollection() override; RimStimPlanModelTemplate* stimPlanModelTemplate( int id ) const; std::vector stimPlanModelTemplates() const; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp index cd592cbe5d..61fef7f43c 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp @@ -54,14 +54,6 @@ RimEnsembleCurveSetCollection::RimEnsembleCurveSetCollection() m_ySourceStepping.xmlCapability()->disableIO(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimEnsembleCurveSetCollection::~RimEnsembleCurveSetCollection() -{ - m_curveSets.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.h b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.h index 0b7b24ff29..6efd10c1cc 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.h @@ -38,7 +38,6 @@ class RimEnsembleCurveSetCollection : public caf::PdmObject public: RimEnsembleCurveSetCollection(); - ~RimEnsembleCurveSetCollection() override; bool isCurveSetsVisible() const; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp index 8ea9fda02b..e9af288277 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp @@ -65,14 +65,6 @@ RimSummaryCurveCollection::RimSummaryCurveCollection() m_ySourceStepping.xmlCapability()->disableIO(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimSummaryCurveCollection::~RimSummaryCurveCollection() -{ - m_curves.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h index 376188283e..64711ef739 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h @@ -45,7 +45,6 @@ private: public: RimSummaryCurveCollection(); - ~RimSummaryCurveCollection() override; bool isCurvesVisible(); diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.cpp index c44197ff15..220443b29e 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.cpp @@ -34,14 +34,6 @@ RimEnsembleWellLogsCollection::RimEnsembleWellLogsCollection() CAF_PDM_InitFieldNoDefault( &m_ensembleWellLogs, "EnsembleWellLogsCollection", "" ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimEnsembleWellLogsCollection::~RimEnsembleWellLogsCollection() -{ - m_ensembleWellLogs.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.h index b53bca398d..7777273178 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.h @@ -31,7 +31,6 @@ class RimEnsembleWellLogsCollection : public caf::PdmObject public: RimEnsembleWellLogsCollection(); - ~RimEnsembleWellLogsCollection() override; std::vector ensembleWellLogs() const; diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.cpp index 6ce834c889..919a37483b 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.cpp @@ -53,14 +53,6 @@ RimOsduWellLog::RimOsduWellLog() setDeletable( true ); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimOsduWellLog::~RimOsduWellLog() -{ - m_wellLogChannels.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.h index 789927232e..22494e074e 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimOsduWellLog.h @@ -44,7 +44,6 @@ class RimOsduWellLog : public RimWellLog public: RimOsduWellLog(); - ~RimOsduWellLog() override; void setName( const QString& name ); QString name() const override; diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp index 384bedd19c..b103ef8426 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.cpp @@ -51,14 +51,6 @@ RimWellLogCsvFile::RimWellLogCsvFile() m_wellLogDataFile = nullptr; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimWellLogCsvFile::~RimWellLogCsvFile() -{ - m_wellLogChannels.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.h index f93a66ce0b..aa38802b1e 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogCsvFile.h @@ -41,7 +41,6 @@ class RimWellLogCsvFile : public RimWellLogFile public: RimWellLogCsvFile(); - ~RimWellLogCsvFile() override; QString name() const override { return m_name; } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp index 28655c2b37..409f3732a1 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.cpp @@ -82,14 +82,6 @@ RimWellLogLasFile::RimWellLogLasFile() m_lasFileHasValidDate = false; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -RimWellLogLasFile::~RimWellLogLasFile() -{ - m_wellLogChannels.deleteChildren(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.h b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.h index 1c679033e5..e72a7a31a9 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.h +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogLasFile.h @@ -44,7 +44,6 @@ class RimWellLogLasFile : public RimWellLogFile public: RimWellLogLasFile(); - ~RimWellLogLasFile() override; static RimWellLogLasFile* readWellLogFile( const QString& logFilePath, QString* errorMessage ); diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScriptingBasicTest.cpp b/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScriptingBasicTest.cpp index 6395bed5a1..62f6c7e102 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScriptingBasicTest.cpp +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScriptingBasicTest.cpp @@ -201,8 +201,6 @@ public: "Whatsthis SimpleObjectsField" ); } - ~InheritedDemoObj() { m_simpleObjectsField.deleteChildren(); } - caf::PdmField> m_texts; caf::PdmField> m_numbers; @@ -222,8 +220,6 @@ public: CAF_PDM_InitFieldNoDefault( &objects, "PdmObjects", "", "", "", "" ) } - ~MyPdmDocument() { objects.deleteChildren(); } - caf::PdmChildArrayField objects; }; CAF_PDM_SOURCE_INIT( MyPdmDocument, "MyPdmDocument" ); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Parent.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Parent.cpp index 74b5371a54..140c1aee39 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Parent.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Parent.cpp @@ -10,7 +10,6 @@ Parent::Parent() Parent::~Parent() { delete m_simpleObjectF(); - m_simpleObjectsField.deleteChildren(); } void Parent::doSome() diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmChildArrayFieldHandleTest.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmChildArrayFieldHandleTest.cpp index f44a40f599..01e1214e63 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmChildArrayFieldHandleTest.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmChildArrayFieldHandleTest.cpp @@ -66,12 +66,6 @@ public: this->addField( &derivedOtherObjs, "derivedOtherObjs" ); } - ~ContainerObj() - { - derivedObjs.deleteChildren(); - derivedOtherObjs.deleteChildren(); - } - caf::PdmChildArrayField derivedObjs; caf::PdmChildArrayField derivedOtherObjs; }; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmReferenceHelperTest.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmReferenceHelperTest.cpp index ee1e11af6a..c5c23a5233 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmReferenceHelperTest.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmReferenceHelperTest.cpp @@ -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 m_pointersField; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXmlBasicTest.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXmlBasicTest.cpp index fc37b8922b..a2281783d3 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXmlBasicTest.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXmlBasicTest.cpp @@ -189,8 +189,6 @@ public: CAF_PDM_XML_InitField( &m_childArrayField, "DemoPdmObjectects" ); } - ~InheritedDemoObj() { m_childArrayField.deleteChildren(); } - caf::PdmDataValueField m_texts; caf::PdmChildArrayField 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 m_pointersField; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafPdmBasicTest.cpp b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafPdmBasicTest.cpp index ea19bdfc4d..d304e06c5f 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafPdmBasicTest.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafPdmBasicTest.cpp @@ -193,8 +193,6 @@ public: "Whatsthis SimpleObjectsField" ); } - ~InheritedDemoObj() { m_simpleObjectsField.deleteChildren(); } - caf::PdmField> m_texts; caf::PdmField> m_testEnumField; caf::PdmChildArrayField m_simpleObjectsField; @@ -212,8 +210,6 @@ public: CAF_PDM_InitFieldNoDefault( &objects, "PdmObjects", "", "", "", "" ) } - ~MyPdmDocument() { objects.deleteChildren(); } - caf::PdmChildArrayField objects; }; CAF_PDM_SOURCE_INIT( MyPdmDocument, "MyPdmDocument" ); diff --git a/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafPdmUiTreeViewModelTest.cpp b/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafPdmUiTreeViewModelTest.cpp index 1f60b7e568..2e1afa06f9 100644 --- a/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafPdmUiTreeViewModelTest.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafPdmUiTreeViewModelTest.cpp @@ -37,8 +37,6 @@ public: m_simpleObjPtrField.uiCapability()->setUiTreeHidden( false ); } - ~DemoPdmObject() { m_simpleObjPtrField.deleteChildren(); } - caf::PdmChildArrayField m_simpleObjPtrField; };