diff --git a/ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.cpp b/ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.cpp index 346ea6e38f..c103de733d 100644 --- a/ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.cpp +++ b/ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.cpp @@ -56,7 +56,7 @@ RiaCompletionTypeCalculationScheduler* RiaCompletionTypeCalculationScheduler::in void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAndRedrawAllViews() { std::vector eclipseCases = - RimProject::current()->activeOilField()->analysisModels->cases().childObjects(); + RimProject::current()->activeOilField()->analysisModels->cases().children(); scheduleRecalculateCompletionTypeAndRedrawAllViews( eclipseCases ); } @@ -94,7 +94,7 @@ void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAnd void RiaCompletionTypeCalculationScheduler::clearCompletionTypeResultsInAllCases() { std::vector eclipseCases = - RimProject::current()->activeOilField()->analysisModels->cases().childObjects(); + RimProject::current()->activeOilField()->analysisModels->cases().children(); clearCompletionTypeResults( eclipseCases ); } diff --git a/ApplicationLibCode/Application/Tools/RiaProjectModifier.cpp b/ApplicationLibCode/Application/Tools/RiaProjectModifier.cpp index 30df42387b..3316ec4acc 100644 --- a/ApplicationLibCode/Application/Tools/RiaProjectModifier.cpp +++ b/ApplicationLibCode/Application/Tools/RiaProjectModifier.cpp @@ -169,7 +169,7 @@ void RiaProjectModifier::replaceSourceCases( RimProject* project ) if ( groupIdToReplace == caseGroup->groupId() ) { RimCaseCollection* caseCollection = caseGroup->caseCollection; - caseCollection->reservoirs.deleteAllChildObjects(); + caseCollection->reservoirs.deleteChildren(); for ( QString fileName : item.second ) { diff --git a/ApplicationLibCode/Commands/EclipseCommands/RicEclipseShowOnlyFaultFeature.cpp b/ApplicationLibCode/Commands/EclipseCommands/RicEclipseShowOnlyFaultFeature.cpp index cdfaaca98c..c945f45743 100644 --- a/ApplicationLibCode/Commands/EclipseCommands/RicEclipseShowOnlyFaultFeature.cpp +++ b/ApplicationLibCode/Commands/EclipseCommands/RicEclipseShowOnlyFaultFeature.cpp @@ -77,7 +77,7 @@ void RicEclipseShowOnlyFaultFeature::onActionTriggered( bool isChecked ) if ( !rimFault->parentField() ) return; std::vector children; - rimFault->parentField()->childObjects( &children ); + rimFault->parentField()->children( &children ); for ( auto& child : children ) { diff --git a/ApplicationLibCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp b/ApplicationLibCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp index 2fc2cf3946..018afed07e 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp @@ -147,7 +147,7 @@ void RicAdvancedSnapshotExportFeature::exportMultipleSnapshots( const QString& f exportViewVariations( copyOfEclipseView, msd, folder ); - eclCase->reservoirViews().removeChildObject( copyOfEclipseView ); + eclCase->reservoirViews().removeChild( copyOfEclipseView ); delete copyOfEclipseView; } @@ -172,7 +172,7 @@ void RicAdvancedSnapshotExportFeature::exportMultipleSnapshots( const QString& f exportViewVariations( copyOfGeoMechView, msd, folder ); - geomCase->geoMechViews().removeChildObject( copyOfGeoMechView ); + geomCase->geoMechViews().removeChild( copyOfGeoMechView ); delete copyOfGeoMechView; } @@ -210,7 +210,7 @@ void RicAdvancedSnapshotExportFeature::exportViewVariations( Rim3dView* exportViewVariationsToFolder( copyOfView, msd, folder ); } - eclCase->reservoirViews().removeChildObject( copyOfView ); + eclCase->reservoirViews().removeChild( copyOfView ); delete copyOfView; } diff --git a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp index 3ad4e5e23e..d7a607ef5d 100644 --- a/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp +++ b/ApplicationLibCode/Commands/ExportCommands/RicExportToLasFileResampleUi.cpp @@ -84,7 +84,7 @@ RicExportToLasFileResampleUi::RicExportToLasFileResampleUi( void ) //-------------------------------------------------------------------------------------------------- RicExportToLasFileResampleUi::~RicExportToLasFileResampleUi() { - m_tvdrkbOffsets.deleteAllChildObjects(); + m_tvdrkbOffsets.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp b/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp index 94f7871476..c209c000e6 100644 --- a/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp +++ b/ApplicationLibCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp @@ -127,7 +127,7 @@ void RiuCreateMultipleFractionsUi::setValues( RimEclipseCase* eclipseCase, void RiuCreateMultipleFractionsUi::resetValues() { m_sourceCase = nullptr; - m_options.deleteAllChildObjects(); + m_options.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -135,7 +135,7 @@ void RiuCreateMultipleFractionsUi::resetValues() //-------------------------------------------------------------------------------------------------- std::vector RiuCreateMultipleFractionsUi::options() const { - return m_options.childObjects(); + return m_options.children(); } //-------------------------------------------------------------------------------------------------- @@ -160,7 +160,7 @@ void RiuCreateMultipleFractionsUi::insertOptionItem( RicCreateMultipleFracturesO //-------------------------------------------------------------------------------------------------- void RiuCreateMultipleFractionsUi::deleteOptionItem( RicCreateMultipleFracturesOptionItemUi* optionsItem ) { - m_options.removeChildObject( optionsItem ); + m_options.removeChild( optionsItem ); delete optionsItem; } @@ -169,7 +169,7 @@ void RiuCreateMultipleFractionsUi::deleteOptionItem( RicCreateMultipleFracturesO //-------------------------------------------------------------------------------------------------- void RiuCreateMultipleFractionsUi::clearOptions() { - m_options.deleteAllChildObjects(); + m_options.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/RicCloseCaseFeature.cpp b/ApplicationLibCode/Commands/RicCloseCaseFeature.cpp index 70f1badf31..4765ec620a 100644 --- a/ApplicationLibCode/Commands/RicCloseCaseFeature.cpp +++ b/ApplicationLibCode/Commands/RicCloseCaseFeature.cpp @@ -152,7 +152,7 @@ void RicCloseCaseFeature::deleteEclipseCase( RimEclipseCase* eclipseCase ) RimIdenticalGridCaseGroup* caseGroup = caseCollection->parentCaseGroup(); CVF_ASSERT( caseGroup ); - caseGroup->statisticsCaseCollection()->reservoirs.removeChildObject( eclipseCase ); + caseGroup->statisticsCaseCollection()->reservoirs.removeChild( eclipseCase ); caseGroup->updateConnectedEditors(); } else @@ -165,7 +165,7 @@ void RicCloseCaseFeature::deleteEclipseCase( RimEclipseCase* eclipseCase ) if ( caseGroup->caseCollection()->reservoirs.size() == 1 ) { std::vector children; - caseGroup->statisticsCaseCollection()->reservoirs.childObjects( &children ); + caseGroup->statisticsCaseCollection()->reservoirs.children( &children ); for ( size_t i = children.size(); i-- > 0; ) { @@ -213,7 +213,7 @@ void RicCloseCaseFeature::deleteEclipseCase( RimEclipseCase* eclipseCase ) if ( cases.empty() ) { - project->multiSnapshotDefinitions.deleteAllChildObjects(); + project->multiSnapshotDefinitions.deleteChildren(); } else { diff --git a/ApplicationLibCode/Commands/RicDeleteItemExec.cpp b/ApplicationLibCode/Commands/RicDeleteItemExec.cpp index 52863ed379..19f4a932c5 100644 --- a/ApplicationLibCode/Commands/RicDeleteItemExec.cpp +++ b/ApplicationLibCode/Commands/RicDeleteItemExec.cpp @@ -52,7 +52,7 @@ void RicDeleteItemExec::redo() if ( listField ) { std::vector children; - listField->childObjects( &children ); + listField->children( &children ); caf::PdmObjectHandle* obj = children[m_commandData.m_indexToObject]; caf::SelectionManager::instance()->removeObjectFromAllSelections( obj ); diff --git a/ApplicationLibCode/Commands/RicDeleteItemFeature.cpp b/ApplicationLibCode/Commands/RicDeleteItemFeature.cpp index 291446d649..3cd8a0076b 100644 --- a/ApplicationLibCode/Commands/RicDeleteItemFeature.cpp +++ b/ApplicationLibCode/Commands/RicDeleteItemFeature.cpp @@ -80,7 +80,7 @@ void RicDeleteItemFeature::onActionTriggered( bool isChecked ) int indexAfter = -1; std::vector childObjects; - childArrayFieldHandle->childObjects( &childObjects ); + childArrayFieldHandle->children( &childObjects ); for ( size_t i = 0; i < childObjects.size(); i++ ) { diff --git a/ApplicationLibCode/Commands/RicElasticPropertiesImportTools.cpp b/ApplicationLibCode/Commands/RicElasticPropertiesImportTools.cpp index 1fba26238e..28bdf5a291 100644 --- a/ApplicationLibCode/Commands/RicElasticPropertiesImportTools.cpp +++ b/ApplicationLibCode/Commands/RicElasticPropertiesImportTools.cpp @@ -166,7 +166,7 @@ std::vector RicElasticPropertiesImportTools::getFormationNames() RimOilField* oilField = project->activeOilField(); RimFormationNamesCollection* formationNamesCollection = oilField->formationNamesCollection(); - for ( RimFormationNames* formationNames : formationNamesCollection->formationNamesList().childObjects() ) + for ( RimFormationNames* formationNames : formationNamesCollection->formationNamesList().children() ) { if ( formationNames && formationNames->formationNamesData() ) { diff --git a/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp b/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp index c8c261c8b6..fe23294674 100644 --- a/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp +++ b/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilFieldEntry.cpp @@ -53,7 +53,7 @@ RimOilFieldEntry::RimOilFieldEntry() //-------------------------------------------------------------------------------------------------- RimOilFieldEntry::~RimOilFieldEntry() { - wells.deleteAllChildObjects(); + wells.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilRegionEntry.cpp b/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilRegionEntry.cpp index 7a81370e84..f03bb5297a 100644 --- a/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilRegionEntry.cpp +++ b/ApplicationLibCode/Commands/SsiHubImportCommands/RimOilRegionEntry.cpp @@ -41,7 +41,7 @@ RimOilRegionEntry::RimOilRegionEntry() //-------------------------------------------------------------------------------------------------- RimOilRegionEntry::~RimOilRegionEntry() { - fields.deleteAllChildObjects(); + fields.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp b/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp index 7bc7edda62..e577c63364 100644 --- a/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp +++ b/ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp @@ -99,7 +99,7 @@ void RimWellPathImport::updateRegions( const QStringList& regionStrings, for ( size_t i = 0; i < fieldsToRemove.size(); i++ ) { - this->regions[regionIdx]->fields.removeChildObject( fieldsToRemove[i] ); + this->regions[regionIdx]->fields.removeChild( fieldsToRemove[i] ); delete fieldsToRemove[i]; } @@ -108,7 +108,7 @@ void RimWellPathImport::updateRegions( const QStringList& regionStrings, for ( size_t i = 0; i < regionsToRemove.size(); i++ ) { - this->regions.removeChildObject( regionsToRemove[i] ); + this->regions.removeChild( regionsToRemove[i] ); delete regionsToRemove[i]; } @@ -218,7 +218,7 @@ void RimWellPathImport::defineObjectEditorAttribute( QString uiConfigName, caf:: //-------------------------------------------------------------------------------------------------- RimWellPathImport::~RimWellPathImport() { - regions.deleteAllChildObjects(); + regions.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp b/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp index e441f07a84..9496e3fcbc 100644 --- a/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp +++ b/ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp @@ -728,7 +728,7 @@ void RiuWellImportWizard::parseWellsResponse( RimOilFieldEntry* oilFieldEntry ) for ( size_t i = 0; i < wellsToRemove.size(); i++ ) { - oilFieldEntry->wells.removeChildObject( wellsToRemove[i] ); + oilFieldEntry->wells.removeChild( wellsToRemove[i] ); delete wellsToRemove[i]; } @@ -902,7 +902,7 @@ void WellSelectionPage::buildWellTreeView() } // Delete all temporary pdm object groups - m_regionsWithVisibleWells->objects.deleteAllChildObjects(); + m_regionsWithVisibleWells->objects.deleteChildren(); for ( size_t rIdx = 0; rIdx < m_wellPathImportObject->regions.size(); rIdx++ ) { @@ -982,7 +982,7 @@ void WellSelectionPage::selectedWellPathEntries( std::vector& do for ( size_t i = 0; i < childFields.size(); i++ ) { std::vector childObjects; - childFields[i]->childObjects( &childObjects ); + childFields[i]->children( &childObjects ); for ( size_t j = 0; j < childObjects.size(); j++ ) { @@ -1117,7 +1117,7 @@ void WellSummaryPage::initializePage() //-------------------------------------------------------------------------------------------------- void WellSummaryPage::updateSummaryPage() { - m_objectGroup->objects.clear(); + m_objectGroup->objects.clearWithoutDelete(); m_textEdit->setText( "Summary of imported wells\n\n" ); diff --git a/ApplicationLibCode/Commands/ToggleCommands/RicToggleItemsOnOthersOffFeature.cpp b/ApplicationLibCode/Commands/ToggleCommands/RicToggleItemsOnOthersOffFeature.cpp index e1e6f06277..76d1086480 100644 --- a/ApplicationLibCode/Commands/ToggleCommands/RicToggleItemsOnOthersOffFeature.cpp +++ b/ApplicationLibCode/Commands/ToggleCommands/RicToggleItemsOnOthersOffFeature.cpp @@ -122,7 +122,7 @@ std::vector RicToggleItemsOnOthersOffFeature::childObject std::vector children; if ( parent ) { - parent->childObjects( &children ); + parent->children( &children ); } return children; } diff --git a/ApplicationLibCode/Commands/ViewLink/RicDeleteAllLinkedViewsFeature.cpp b/ApplicationLibCode/Commands/ViewLink/RicDeleteAllLinkedViewsFeature.cpp index 4bddb6d8aa..fc60d154ce 100644 --- a/ApplicationLibCode/Commands/ViewLink/RicDeleteAllLinkedViewsFeature.cpp +++ b/ApplicationLibCode/Commands/ViewLink/RicDeleteAllLinkedViewsFeature.cpp @@ -42,7 +42,7 @@ public: { // Remove the view linker object from the view linker collection // viewLinkerCollection->viewLinker is a PdmChildField containing one RimViewLinker child object - proj->viewLinkerCollection->viewLinker.removeChildObject( viewLinker ); + proj->viewLinkerCollection->viewLinker.removeChild( viewLinker ); viewLinker->applyCellFilterCollectionByUserChoice(); diff --git a/ApplicationLibCode/Commands/ViewLink/RicUnLinkViewFeature.cpp b/ApplicationLibCode/Commands/ViewLink/RicUnLinkViewFeature.cpp index 710c8f11fd..b399451539 100644 --- a/ApplicationLibCode/Commands/ViewLink/RicUnLinkViewFeature.cpp +++ b/ApplicationLibCode/Commands/ViewLink/RicUnLinkViewFeature.cpp @@ -87,7 +87,7 @@ void RicUnLinkViewFeature::onActionTriggered( bool isChecked ) { // Remove the view linker object from the view linker collection // viewLinkerCollection->viewLinker is a PdmChildField containing one RimViewLinker child object - RimProject::current()->viewLinkerCollection->viewLinker.removeChildObject( viewLinker ); + RimProject::current()->viewLinkerCollection->viewLinker.removeChild( viewLinker ); delete viewLinker; } diff --git a/ApplicationLibCode/FileInterface/RifEclipseInputPropertyLoader.cpp b/ApplicationLibCode/FileInterface/RifEclipseInputPropertyLoader.cpp index 581ab2c71f..1e541d6334 100644 --- a/ApplicationLibCode/FileInterface/RifEclipseInputPropertyLoader.cpp +++ b/ApplicationLibCode/FileInterface/RifEclipseInputPropertyLoader.cpp @@ -45,7 +45,7 @@ void RifEclipseInputPropertyLoader::loadAndSyncronizeInputProperties( RimEclipse const std::vector& filenames, bool allowImportOfFaults ) { - std::vector existingProperties = inputPropertyCollection->inputProperties.childObjects(); + std::vector existingProperties = inputPropertyCollection->inputProperties.children(); caf::ProgressInfo progInfo( static_cast( filenames.size() ), "Reading Input properties" ); diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp index 7417aefd2b..9d178e8386 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp @@ -206,7 +206,7 @@ RimPlotDataFilterCollection* RimAnalysisPlot::plotDataFilterCollection() const //-------------------------------------------------------------------------------------------------- void RimAnalysisPlot::setCurveDefinitions( const std::vector& curveDefinitions ) { - m_analysisPlotDataSelection.deleteAllChildObjects(); + m_analysisPlotDataSelection.deleteChildren(); for ( auto curveDef : curveDefinitions ) { auto dataEntry = new RimAnalysisPlotDataEntry(); @@ -463,7 +463,7 @@ void RimAnalysisPlot::fieldChangedByUi( const caf::PdmFieldHandle* changedField, { std::vector summaryVectorDefinitions = dlg.curveSelection(); - m_analysisPlotDataSelection.deleteAllChildObjects(); + m_analysisPlotDataSelection.deleteChildren(); for ( const RiaSummaryCurveDefinition& vectorDef : summaryVectorDefinitions ) { auto dataEntry = new RimAnalysisPlotDataEntry(); @@ -1794,7 +1794,7 @@ void RimAnalysisPlot::onCaseRemoved( const SignalEmitter* emitter, RimSummaryCas { if ( existingEntry->summaryCase() == summaryCase ) { - m_analysisPlotDataSelection.removeChildObject( existingEntry ); + m_analysisPlotDataSelection.removeChild( existingEntry ); delete existingEntry; break; } diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp index 41c562d0f4..d65e226c06 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlotCollection.cpp @@ -123,7 +123,7 @@ void RimAnalysisPlotCollection::updateSummaryNameHasChanged() //-------------------------------------------------------------------------------------------------- std::vector RimAnalysisPlotCollection::plots() const { - return m_analysisPlots.childObjects(); + return m_analysisPlots.children(); } //-------------------------------------------------------------------------------------------------- @@ -263,6 +263,6 @@ void RimAnalysisPlotCollection::insertPlot( RimAnalysisPlot* analysisPlot, size_ //-------------------------------------------------------------------------------------------------- void RimAnalysisPlotCollection::removePlot( RimAnalysisPlot* analysisPlot ) { - m_analysisPlots.removeChildObject( analysisPlot ); + m_analysisPlots.removeChild( analysisPlot ); updateAllRequiredEditors(); } diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterCollection.cpp index 36495eb5a9..1292b49321 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimPlotDataFilterCollection.cpp @@ -56,7 +56,7 @@ RimPlotDataFilterItem* RimPlotDataFilterCollection::addFilter() //-------------------------------------------------------------------------------------------------- void RimPlotDataFilterCollection::removeFilter( RimPlotDataFilterItem* filter ) { - m_filters.removeChildObject( filter ); + m_filters.removeChild( filter ); delete filter; filtersChanged.send(); @@ -67,7 +67,7 @@ void RimPlotDataFilterCollection::removeFilter( RimPlotDataFilterItem* filter ) //-------------------------------------------------------------------------------------------------- std::vector RimPlotDataFilterCollection::filters() const { - return m_filters.childObjects(); + return m_filters.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp index 2bc08140b7..7e6ba9cb74 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationGroupCollection.cpp @@ -95,7 +95,7 @@ void RimAnnotationGroupCollection::addAnnotation( caf::PdmObject* annotation ) //-------------------------------------------------------------------------------------------------- void RimAnnotationGroupCollection::removeAnnotation( caf::PdmObject* annotation ) { - m_annotations.removeChildObject( annotation ); + m_annotations.removeChild( annotation ); } //-------------------------------------------------------------------------------------------------- @@ -103,7 +103,7 @@ void RimAnnotationGroupCollection::removeAnnotation( caf::PdmObject* annotation //-------------------------------------------------------------------------------------------------- std::vector RimAnnotationGroupCollection::annotations() const { - return m_annotations.childObjects(); + return m_annotations.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp index 956c1ccd14..15065996a4 100644 --- a/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/Annotations/RimUserDefinedPolylinesAnnotation.cpp @@ -95,7 +95,7 @@ cvf::ref RimUserDefinedPolylinesAnnotation::polyLinesData() //-------------------------------------------------------------------------------------------------- std::vector RimUserDefinedPolylinesAnnotation::activeTargets() const { - return m_targets.childObjects(); + return m_targets.children(); } //-------------------------------------------------------------------------------------------------- @@ -113,7 +113,7 @@ void RimUserDefinedPolylinesAnnotation::appendTarget( const cvf::Vec3d& defaultP { RimPolylineTarget* target = nullptr; - auto targets = m_targets.childObjects(); + auto targets = m_targets.children(); if ( targets.empty() ) { target = new RimPolylineTarget(); @@ -149,7 +149,7 @@ void RimUserDefinedPolylinesAnnotation::insertTarget( const RimPolylineTarget* t //-------------------------------------------------------------------------------------------------- void RimUserDefinedPolylinesAnnotation::deleteTarget( RimPolylineTarget* targetToDelete ) { - m_targets.removeChildObject( targetToDelete ); + m_targets.removeChild( targetToDelete ); delete targetToDelete; } diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp index 6130291f9d..ef0357f0f0 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimCellFilterCollection.cpp @@ -103,7 +103,7 @@ void RimCellFilterCollection::setCase( RimCase* theCase ) //-------------------------------------------------------------------------------------------------- std::vector RimCellFilterCollection::filters() const { - return m_cellFilters.childObjects(); + return m_cellFilters.children(); } //-------------------------------------------------------------------------------------------------- @@ -120,7 +120,7 @@ void RimCellFilterCollection::initAfterRead() } for ( auto& filter : filters ) { - m_rangeFilters_OBSOLETE.removeChildObject( filter ); + m_rangeFilters_OBSOLETE.removeChild( filter ); m_cellFilters.push_back( filter ); } @@ -328,7 +328,7 @@ void RimCellFilterCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* //-------------------------------------------------------------------------------------------------- void RimCellFilterCollection::removeFilter( RimCellFilter* filter ) { - m_cellFilters.removeChildObject( filter ); + m_cellFilters.removeChild( filter ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp index 9ee522722c..857c378294 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilterCollection.cpp @@ -47,7 +47,7 @@ RimEclipsePropertyFilterCollection::RimEclipsePropertyFilterCollection() //-------------------------------------------------------------------------------------------------- RimEclipsePropertyFilterCollection::~RimEclipsePropertyFilterCollection() { - propertyFilters.deleteAllChildObjects(); + propertyFilters.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.cpp index 33d7c8df4e..7077ea9f95 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimGeoMechPropertyFilterCollection.cpp @@ -45,7 +45,7 @@ RimGeoMechPropertyFilterCollection::RimGeoMechPropertyFilterCollection() //-------------------------------------------------------------------------------------------------- RimGeoMechPropertyFilterCollection::~RimGeoMechPropertyFilterCollection() { - propertyFilters.deleteAllChildObjects(); + propertyFilters.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp b/ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp index 7fb3d7649b..b6a3dffbfc 100644 --- a/ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/CellFilters/RimPolygonFilter.cpp @@ -257,7 +257,7 @@ QString RimPolygonFilter::fullName() const //-------------------------------------------------------------------------------------------------- std::vector RimPolygonFilter::activeTargets() const { - return m_targets.childObjects(); + return m_targets.children(); } //-------------------------------------------------------------------------------------------------- @@ -279,7 +279,7 @@ void RimPolygonFilter::insertTarget( const RimPolylineTarget* targetToInsertBefo //-------------------------------------------------------------------------------------------------- void RimPolygonFilter::deleteTarget( RimPolylineTarget* targetToDelete ) { - m_targets.removeChildObject( targetToDelete ); + m_targets.removeChild( targetToDelete ); delete targetToDelete; } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp index cc14742fa6..561ed9a4d9 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/Rim3dWellLogCurveCollection.cpp @@ -50,7 +50,7 @@ Rim3dWellLogCurveCollection::Rim3dWellLogCurveCollection() //-------------------------------------------------------------------------------------------------- Rim3dWellLogCurveCollection::~Rim3dWellLogCurveCollection() { - m_3dWellLogCurves.deleteAllChildObjects(); + m_3dWellLogCurves.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -80,7 +80,7 @@ void Rim3dWellLogCurveCollection::add3dWellLogCurve( Rim3dWellLogCurve* curve ) //-------------------------------------------------------------------------------------------------- void Rim3dWellLogCurveCollection::remove3dWellLogCurve( Rim3dWellLogCurve* curve ) { - m_3dWellLogCurves.removeChildObject( curve ); + m_3dWellLogCurves.removeChild( curve ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatisticsCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatisticsCollection.cpp index 27b94eee6a..bf71d7cfe4 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatisticsCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatisticsCollection.cpp @@ -46,7 +46,7 @@ void RimEnsembleFractureStatisticsCollection::addFractureGroupStatistics( RimEns //-------------------------------------------------------------------------------------------------- void RimEnsembleFractureStatisticsCollection::loadAndUpdateData() { - for ( auto f : m_fractureGroupStatistics.childObjects() ) + for ( auto f : m_fractureGroupStatistics.children() ) { f->loadAndUpdateData(); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp index 0a33fed054..b1a1c5d74c 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp @@ -155,7 +155,7 @@ std::vector RimFishbonesCollection::activeFishbonesSubs() const //-------------------------------------------------------------------------------------------------- std::vector RimFishbonesCollection::allFishbonesSubs() const { - return m_fishbones.childObjects(); + return m_fishbones.children(); } //-------------------------------------------------------------------------------------------------- @@ -228,7 +228,7 @@ double RimFishbonesCollection::endMD() const double endMD = m_startMD; if ( !m_fishbones.empty() ) { - auto lastFishbone = m_fishbones.childObjects().back(); + auto lastFishbone = m_fishbones.children().back(); CVF_ASSERT( lastFishbone ); endMD = lastFishbone->endMD(); } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp index 2f26e6046a..d607ef8463 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimFractureTemplateCollection.cpp @@ -71,7 +71,7 @@ RimFractureTemplateCollection::RimFractureTemplateCollection() //-------------------------------------------------------------------------------------------------- RimFractureTemplateCollection::~RimFractureTemplateCollection() { - m_fractureDefinitions.deleteAllChildObjects(); + m_fractureDefinitions.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp index 3f148981e0..f35aa426a6 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimPerforationCollection.cpp @@ -59,7 +59,7 @@ RimPerforationCollection::RimPerforationCollection() //-------------------------------------------------------------------------------------------------- RimPerforationCollection::~RimPerforationCollection() { - m_perforations.deleteAllChildObjects(); + m_perforations.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp index 7ad9048437..6fe6f2d766 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimSimWellFractureCollection.cpp @@ -41,7 +41,7 @@ RimSimWellFractureCollection::RimSimWellFractureCollection( void ) //-------------------------------------------------------------------------------------------------- RimSimWellFractureCollection::~RimSimWellFractureCollection() { - simwellFractures.deleteAllChildObjects(); + simwellFractures.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -49,7 +49,7 @@ RimSimWellFractureCollection::~RimSimWellFractureCollection() //-------------------------------------------------------------------------------------------------- void RimSimWellFractureCollection::deleteFractures() { - simwellFractures.deleteAllChildObjects(); + simwellFractures.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp index 1f5aec2f94..144863bbd0 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimValveTemplateCollection.cpp @@ -69,7 +69,7 @@ void RimValveTemplateCollection::addValveTemplate( RimValveTemplate* valveTempla //-------------------------------------------------------------------------------------------------- void RimValveTemplateCollection::removeAndDeleteValveTemplate( RimValveTemplate* valveTemplate ) { - m_valveDefinitions.removeChildObject( valveTemplate ); + m_valveDefinitions.removeChild( valveTemplate ); delete valveTemplate; } diff --git a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp index 16714da3ab..2317133b9d 100644 --- a/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp @@ -69,7 +69,7 @@ void RimWellPathFractureCollection::addFracture( RimWellPathFracture* fracture ) //-------------------------------------------------------------------------------------------------- void RimWellPathFractureCollection::deleteFractures() { - m_fractures.deleteAllChildObjects(); + m_fractures.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -77,7 +77,7 @@ void RimWellPathFractureCollection::deleteFractures() //-------------------------------------------------------------------------------------------------- std::vector RimWellPathFractureCollection::allFractures() const { - return m_fractures.childObjects(); + return m_fractures.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp index a43636a55d..3f7ebbb600 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp @@ -105,7 +105,7 @@ RimAbstractCorrelationPlot::~RimAbstractCorrelationPlot() //-------------------------------------------------------------------------------------------------- void RimAbstractCorrelationPlot::setCurveDefinitions( const std::vector& curveDefinitions ) { - m_dataSources.deleteAllChildObjects(); + m_dataSources.deleteChildren(); for ( auto curveDef : curveDefinitions ) { auto dataEntry = new RimAnalysisPlotDataEntry(); @@ -155,7 +155,7 @@ void RimAbstractCorrelationPlot::fieldChangedByUi( const caf::PdmFieldHandle* ch if ( !curveSelection.empty() ) { std::vector summaryVectorDefinitions = dlg.curveSelection(); - m_dataSources.deleteAllChildObjects(); + m_dataSources.deleteChildren(); for ( const RiaSummaryCurveDefinition& vectorDef : summaryVectorDefinitions ) { auto plotEntry = new RimAnalysisPlotDataEntry(); diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.cpp index 78c5ad7e40..3570687983 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlotCollection.cpp @@ -193,7 +193,7 @@ void RimCorrelationPlotCollection::insertPlot( RimAbstractCorrelationPlot* plot, //-------------------------------------------------------------------------------------------------- void RimCorrelationPlotCollection::removePlot( RimAbstractCorrelationPlot* plot ) { - m_correlationPlots.removeChildObject( plot ); + m_correlationPlots.removeChild( plot ); updateAllRequiredEditors(); } @@ -202,7 +202,7 @@ void RimCorrelationPlotCollection::removePlot( RimAbstractCorrelationPlot* plot //-------------------------------------------------------------------------------------------------- std::vector RimCorrelationPlotCollection::plots() const { - return m_correlationPlots.childObjects(); + return m_correlationPlots.children(); } //-------------------------------------------------------------------------------------------------- @@ -218,7 +218,7 @@ size_t RimCorrelationPlotCollection::plotCount() const //-------------------------------------------------------------------------------------------------- std::vector RimCorrelationPlotCollection::reports() const { - return m_correlationReports.childObjects(); + return m_correlationReports.children(); } //-------------------------------------------------------------------------------------------------- @@ -227,7 +227,7 @@ std::vector RimCorrelationPlotCollection::reports() c void RimCorrelationPlotCollection::deleteAllPlots() { RimTypedPlotCollection::deleteAllPlots(); - m_correlationReports.deleteAllChildObjects(); + m_correlationReports.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp index c343a8c292..5e26badf1a 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp @@ -117,7 +117,7 @@ RimFaultInViewCollection::RimFaultInViewCollection() //-------------------------------------------------------------------------------------------------- RimFaultInViewCollection::~RimFaultInViewCollection() { - faults.deleteAllChildObjects(); + faults.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -269,7 +269,7 @@ void RimFaultInViewCollection::syncronizeFaults() newFaults.push_back( rimFault ); } - this->faults().clear(); + this->faults().clearWithoutDelete(); this->faults().insert( 0, newFaults ); QString toolTip = QString( "Fault count (%1)" ).arg( newFaults.size() ); diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp index bd5a791e5e..1e0a3ffff4 100644 --- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp @@ -270,7 +270,7 @@ void RimFaultRASettings::initFromPreprocSettings( RimFaultRAPreprocSettings* pre RifParameterXmlReader basicreader( RiaPreferencesGeoMech::current()->geomechFRADefaultBasicXML() ); if ( !basicreader.parseFile( errorText ) ) return; - m_basicParameters.clear(); + m_basicParameters.clearWithoutDelete(); for ( auto group : basicreader.parameterGroups() ) { m_basicParameters.push_back( group ); @@ -281,7 +281,7 @@ void RimFaultRASettings::initFromPreprocSettings( RimFaultRAPreprocSettings* pre RifParameterXmlReader advreader( RiaPreferencesGeoMech::current()->geomechFRADefaultAdvXML() ); if ( !advreader.parseFile( errorText ) ) return; - m_advancedParameters.clear(); + m_advancedParameters.clearWithoutDelete(); for ( auto group : advreader.parameterGroups() ) { m_advancedParameters.push_back( group ); @@ -406,7 +406,7 @@ std::list RimFaultRASettings::basicParameters( int faultID retlist.push_back( p ); } - for ( auto& group : m_basicParameters.childObjects() ) + for ( auto& group : m_basicParameters.children() ) { for ( auto& p : group->parameters() ) { @@ -437,7 +437,7 @@ std::list RimFaultRASettings::advancedParameters( int faul retlist.push_back( p ); } - for ( auto& group : m_advancedParameters.childObjects() ) + for ( auto& group : m_advancedParameters.children() ) { for ( auto& p : group->parameters() ) { @@ -611,13 +611,13 @@ RimGenericParameter* RimFaultRASettings::getInputParameter( QString name ) const { RimGenericParameter* retval = nullptr; - for ( auto group : m_basicParameters.childObjects() ) + for ( auto group : m_basicParameters.children() ) { retval = group->parameter( name ); if ( retval != nullptr ) return retval; } - for ( auto group : m_advancedParameters.childObjects() ) + for ( auto group : m_advancedParameters.children() ) { retval = group->parameter( name ); if ( retval != nullptr ) return retval; diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp index e2a3390fe3..3c7153ac5f 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp @@ -60,7 +60,7 @@ RimFlowPlotCollection::~RimFlowPlotCollection() { delete m_defaultWellAllocPlot(); - m_storedWellAllocPlots.deleteAllChildObjects(); + m_storedWellAllocPlots.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -78,8 +78,8 @@ void RimFlowPlotCollection::deleteAllPlots() // delete m_dbgWellDistributionPlot; delete m_wellDistributionPlotCollection; - m_storedWellAllocPlots.deleteAllChildObjects(); - m_storedFlowCharacteristicsPlots.deleteAllChildObjects(); + m_storedWellAllocPlots.deleteChildren(); + m_storedFlowCharacteristicsPlots.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp index 7bda3287c9..5df1626e7e 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp @@ -99,7 +99,7 @@ RimWellDistributionPlotCollection::RimWellDistributionPlotCollection() RimWellDistributionPlotCollection::~RimWellDistributionPlotCollection() { removeMdiWindowFromMdiArea(); - m_plots.deleteAllChildObjects(); + m_plots.deleteChildren(); cleanupBeforeClose(); } @@ -384,7 +384,7 @@ void RimWellDistributionPlotCollection::updatePlots() //-------------------------------------------------------------------------------------------------- void RimWellDistributionPlotCollection::cleanupBeforeClose() { - auto plotVector = m_plots.childObjects(); + auto plotVector = m_plots.children(); for ( size_t tIdx = 0; tIdx < plotVector.size(); ++tIdx ) { plotVector[tIdx]->detachAllCurves(); diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp index 84918bbc94..39563b3d8b 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp @@ -1045,7 +1045,7 @@ void RimWellPltPlot::initAfterLoad() //-------------------------------------------------------------------------------------------------- void RimWellPltPlot::syncSourcesIoFieldFromGuiField() { - m_selectedSourcesForIo.clear(); + m_selectedSourcesForIo.clearWithoutDelete(); for ( const RifDataSourceForRftPlt& addr : m_selectedSources() ) { diff --git a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp index 911e0b5f3d..f4c91261fd 100644 --- a/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp @@ -1360,7 +1360,7 @@ void RimWellRftPlot::createEnsembleCurveSets() for ( RimWellRftEnsembleCurveSet* curveSet : curveSetsToDelete ) { - m_ensembleCurveSets.removeChildObject( curveSet ); + m_ensembleCurveSets.removeChild( curveSet ); delete curveSet; } diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp index 6faf651946..9f0b361be2 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp @@ -183,7 +183,7 @@ RimGeoMechCase::RimGeoMechCase( void ) //-------------------------------------------------------------------------------------------------- RimGeoMechCase::~RimGeoMechCase( void ) { - geoMechViews.deleteAllChildObjects(); + geoMechViews.deleteChildren(); RimProject* project = RimProject::current(); if ( project ) @@ -418,7 +418,7 @@ std::vector RimGeoMechCase::allSpecialViews() const void RimGeoMechCase::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ ) { std::vector children; - geoMechViews.childObjects( &children ); + geoMechViews.children( &children ); for ( auto child : children ) uiTreeOrdering.add( child ); diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapViewCollection.cpp index 61974dc1b2..37dfae92dc 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapViewCollection.cpp @@ -28,7 +28,7 @@ RimGeoMechContourMapViewCollection::~RimGeoMechContourMapViewCollection() //-------------------------------------------------------------------------------------------------- std::vector RimGeoMechContourMapViewCollection::views() { - return m_contourMapViews.childObjects(); + return m_contourMapViews.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp index 1ba13b3d44..05b3a3c34d 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechModels.cpp @@ -52,7 +52,7 @@ RimGeoMechModels::~RimGeoMechModels( void ) //-------------------------------------------------------------------------------------------------- std::vector RimGeoMechModels::cases() const { - return m_cases.childObjects(); + return m_cases.children(); } //-------------------------------------------------------------------------------------------------- @@ -68,7 +68,7 @@ void RimGeoMechModels::addCase( RimGeoMechCase* thecase ) //-------------------------------------------------------------------------------------------------- void RimGeoMechModels::removeCase( RimGeoMechCase* thecase ) { - m_cases.removeChildObject( thecase ); + m_cases.removeChild( thecase ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPartCollection.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPartCollection.cpp index ed591abb0b..6412b3ffd2 100644 --- a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPartCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechPartCollection.cpp @@ -69,7 +69,7 @@ void RimGeoMechPartCollection::syncWithCase( RimGeoMechCase* geoCase ) if ( count != (int)m_parts.size() ) { - m_parts.clear(); + m_parts.clearWithoutDelete(); for ( int i = 0; i < count; i++ ) { @@ -91,7 +91,7 @@ void RimGeoMechPartCollection::syncWithCase( RimGeoMechCase* geoCase ) //-------------------------------------------------------------------------------------------------- std::vector RimGeoMechPartCollection::parts() const { - return m_parts.childObjects(); + return m_parts.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp index 8b5581ec14..1151b0c0d7 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp @@ -143,7 +143,7 @@ void RimGridCrossPlot::addDataSet( RimGridCrossPlotDataSet* dataSet ) //-------------------------------------------------------------------------------------------------- std::vector RimGridCrossPlot::dataSets() const { - return m_crossPlotDataSets.childObjects(); + return m_crossPlotDataSets.children(); } //-------------------------------------------------------------------------------------------------- @@ -642,8 +642,8 @@ void RimGridCrossPlot::swapAxes() yAxisProperties->plotAxisType().axis() ); yAxisProperties->setNameAndAxis( tmpName, tmpTitle, tmpAxis.axis() ); - m_xAxisProperties.removeChildObject( xAxisProperties ); - m_yAxisProperties.removeChildObject( yAxisProperties ); + m_xAxisProperties.removeChild( xAxisProperties ); + m_yAxisProperties.removeChild( yAxisProperties ); m_yAxisProperties = xAxisProperties; m_xAxisProperties = yAxisProperties; diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCollection.cpp index 51c3fdaeb3..2342240f13 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCollection.cpp @@ -45,7 +45,7 @@ RimGridCrossPlotCollection::~RimGridCrossPlotCollection() //-------------------------------------------------------------------------------------------------- std::vector RimGridCrossPlotCollection::plots() const { - return m_gridCrossPlots.childObjects(); + return m_gridCrossPlots.children(); } //-------------------------------------------------------------------------------------------------- @@ -82,6 +82,6 @@ void RimGridCrossPlotCollection::insertPlot( RimGridCrossPlot* plot, size_t inde //-------------------------------------------------------------------------------------------------- void RimGridCrossPlotCollection::removePlot( RimGridCrossPlot* plot ) { - m_gridCrossPlots.removeChildObject( plot ); + m_gridCrossPlots.removeChild( plot ); updateAllRequiredEditors(); } diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp index 3eae5418bb..9d08a5b10c 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp @@ -372,7 +372,7 @@ RimRegularLegendConfig* RimGridCrossPlotDataSet::legendConfig() const //-------------------------------------------------------------------------------------------------- std::vector RimGridCrossPlotDataSet::curves() const { - return m_crossPlotCurves.childObjects(); + return m_crossPlotCurves.children(); } //-------------------------------------------------------------------------------------------------- @@ -684,7 +684,7 @@ void RimGridCrossPlotDataSet::fillCurveDataInExistingCurves( const RigEclipseCro void RimGridCrossPlotDataSet::destroyCurves() { detachAllCurves(); - m_crossPlotCurves.deleteAllChildObjects(); + m_crossPlotCurves.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -970,7 +970,7 @@ QList RimGridCrossPlotDataSet::calculateValueOptions( co if ( eclipseCase ) { options.push_back( caf::PdmOptionItemInfo( "Disabled", nullptr ) ); - for ( RimEclipseView* view : eclipseCase->reservoirViews.childObjects() ) + for ( RimEclipseView* view : eclipseCase->reservoirViews.children() ) { CVF_ASSERT( view && "Really always should have a valid view pointer in ReservoirViews" ); options.push_back( caf::PdmOptionItemInfo( view->name(), view, false, view->uiIconProvider() ) ); @@ -1122,8 +1122,8 @@ void RimGridCrossPlotDataSet::swapAxisProperties( bool updatePlot ) RimEclipseResultDefinition* xAxisProperties = m_xAxisProperty(); RimEclipseResultDefinition* yAxisProperties = m_yAxisProperty(); - m_xAxisProperty.removeChildObject( xAxisProperties ); - m_yAxisProperty.removeChildObject( yAxisProperties ); + m_xAxisProperty.removeChild( xAxisProperties ); + m_yAxisProperty.removeChild( yAxisProperties ); m_yAxisProperty = xAxisProperties; m_xAxisProperty = yAxisProperties; diff --git a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp index 7dccc1a41b..da80d9b90f 100644 --- a/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp @@ -110,7 +110,7 @@ std::vector //-------------------------------------------------------------------------------------------------- std::vector RimSaturationPressurePlotCollection::plots() const { - return m_saturationPressurePlots.childObjects(); + return m_saturationPressurePlots.children(); } //-------------------------------------------------------------------------------------------------- @@ -126,7 +126,7 @@ size_t RimSaturationPressurePlotCollection::plotCount() const //-------------------------------------------------------------------------------------------------- void RimSaturationPressurePlotCollection::deleteAllPlots() { - m_saturationPressurePlots.deleteAllChildObjects(); + m_saturationPressurePlots.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp index 850c9668e8..af6b931d30 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionCollection.cpp @@ -79,8 +79,8 @@ RimIntersectionCollection::RimIntersectionCollection() //-------------------------------------------------------------------------------------------------- RimIntersectionCollection::~RimIntersectionCollection() { - m_intersections.deleteAllChildObjects(); - m_intersectionBoxes.deleteAllChildObjects(); + m_intersections.deleteChildren(); + m_intersectionBoxes.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -254,7 +254,7 @@ void RimIntersectionCollection::rebuildGeometry() //-------------------------------------------------------------------------------------------------- std::vector RimIntersectionCollection::intersections() const { - return m_intersections.childObjects(); + return m_intersections.children(); } //-------------------------------------------------------------------------------------------------- @@ -262,7 +262,7 @@ std::vector RimIntersectionCollection::intersecti //-------------------------------------------------------------------------------------------------- std::vector RimIntersectionCollection::intersectionBoxes() const { - return m_intersectionBoxes.childObjects(); + return m_intersectionBoxes.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp index ba669d4a05..26275e1ba2 100644 --- a/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultsDefinitionCollection.cpp @@ -61,7 +61,7 @@ bool RimIntersectionResultsDefinitionCollection::isActive() const //-------------------------------------------------------------------------------------------------- std::vector RimIntersectionResultsDefinitionCollection::intersectionResultsDefinitions() const { - return m_intersectionResultsDefs.childObjects(); + return m_intersectionResultsDefs.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Parameters/RimParameterGroup.cpp b/ApplicationLibCode/ProjectDataModel/Parameters/RimParameterGroup.cpp index 517384de5b..590e2f1b89 100644 --- a/ApplicationLibCode/ProjectDataModel/Parameters/RimParameterGroup.cpp +++ b/ApplicationLibCode/ProjectDataModel/Parameters/RimParameterGroup.cpp @@ -280,7 +280,7 @@ std::vector RimParameterGroup::parameters() const { std::vector retParams; - for ( const auto& p : m_parameters.childObjects() ) + for ( const auto& p : m_parameters.children() ) { if ( isListParameter( p->name() ) ) continue; retParams.push_back( p ); @@ -288,7 +288,7 @@ std::vector RimParameterGroup::parameters() const for ( const auto& list : m_lists ) { - retParams.push_back( list->getAsListParameter( m_parameters.childObjects() ) ); + retParams.push_back( list->getAsListParameter( m_parameters.children() ) ); } return retParams; @@ -324,7 +324,7 @@ void RimParameterGroup::setParameterValue( QString name, QString value ) //-------------------------------------------------------------------------------------------------- RimGenericParameter* RimParameterGroup::parameter( QString name ) const { - for ( auto& p : m_parameters.childObjects() ) + for ( auto& p : m_parameters.children() ) { if ( p->name() == name ) { diff --git a/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp b/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp index 89138401af..55dbc92ac6 100644 --- a/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp +++ b/ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp @@ -56,8 +56,8 @@ RimPlotTemplateFolderItem::~RimPlotTemplateFolderItem() //-------------------------------------------------------------------------------------------------- void RimPlotTemplateFolderItem::createRootFolderItemsFromFolderPaths( const QStringList& folderPaths ) { - m_fileNames.deleteAllChildObjects(); - m_subFolders.deleteAllChildObjects(); + m_fileNames.deleteChildren(); + m_subFolders.deleteChildren(); createSubFolderItemsFromFolderPaths( folderPaths ); } @@ -67,7 +67,7 @@ void RimPlotTemplateFolderItem::createRootFolderItemsFromFolderPaths( const QStr //-------------------------------------------------------------------------------------------------- std::vector RimPlotTemplateFolderItem::fileNames() const { - return m_fileNames.childObjects(); + return m_fileNames.children(); } //-------------------------------------------------------------------------------------------------- @@ -75,7 +75,7 @@ std::vector RimPlotTemplateFolderItem::fileNames() con //-------------------------------------------------------------------------------------------------- std::vector RimPlotTemplateFolderItem::subFolders() const { - return m_subFolders.childObjects(); + return m_subFolders.children(); } //-------------------------------------------------------------------------------------------------- @@ -103,8 +103,8 @@ void RimPlotTemplateFolderItem::setFolderPath( const QString& path ) //-------------------------------------------------------------------------------------------------- void RimPlotTemplateFolderItem::searchForFileAndFolderNames() { - m_fileNames.deleteAllChildObjects(); - m_subFolders.deleteAllChildObjects(); + m_fileNames.deleteChildren(); + m_subFolders.deleteChildren(); if ( m_folderName().path().isEmpty() ) { diff --git a/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp index 65aefd1f73..6680d03536 100644 --- a/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp @@ -47,7 +47,7 @@ Rim2dIntersectionViewCollection::~Rim2dIntersectionViewCollection() //-------------------------------------------------------------------------------------------------- std::vector Rim2dIntersectionViewCollection::views() { - return m_intersectionViews.childObjects(); + return m_intersectionViews.children(); } //-------------------------------------------------------------------------------------------------- @@ -73,7 +73,7 @@ void Rim2dIntersectionViewCollection::syncFromExistingIntersections( bool doUpda // Clean up the container by removing nullptr's - m_intersectionViews.removeChildObject( nullptr ); + m_intersectionViews.removeChild( nullptr ); // Build map from intersection to view @@ -84,7 +84,7 @@ void Rim2dIntersectionViewCollection::syncFromExistingIntersections( bool doUpda intersectionToViewMap[iv->intersection()] = iv; } - m_intersectionViews.clear(); // Not deleting the views. The are managed by the map + m_intersectionViews.clearWithoutDelete(); // Not deleting the views. The are managed by the map // Insert the old views in correct order, and create new views as we go diff --git a/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp index 2cf42c7fbe..fc53bd0bcc 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCaseCollection.cpp @@ -41,7 +41,7 @@ RimCaseCollection::RimCaseCollection() //-------------------------------------------------------------------------------------------------- RimCaseCollection::~RimCaseCollection() { - reservoirs.deleteAllChildObjects(); + reservoirs.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimColorLegend.cpp b/ApplicationLibCode/ProjectDataModel/RimColorLegend.cpp index 863707c04b..da747e72ac 100644 --- a/ApplicationLibCode/ProjectDataModel/RimColorLegend.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimColorLegend.cpp @@ -104,7 +104,7 @@ void RimColorLegend::appendColorLegendItem( RimColorLegendItem* colorLegendItem //-------------------------------------------------------------------------------------------------- std::vector RimColorLegend::colorLegendItems() const { - return m_colorLegendItems.childObjects(); + return m_colorLegendItems.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimColorLegendCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimColorLegendCollection.cpp index d883e5974c..c2bd9e2f76 100644 --- a/ApplicationLibCode/ProjectDataModel/RimColorLegendCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimColorLegendCollection.cpp @@ -76,7 +76,7 @@ bool RimColorLegendCollection::isStandardColorLegend( RimColorLegend* legend ) //-------------------------------------------------------------------------------------------------- void RimColorLegendCollection::deleteCustomColorLegends() { - m_customColorLegends.deleteAllChildObjects(); + m_customColorLegends.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -138,13 +138,13 @@ std::vector RimColorLegendCollection::allColorLegends() const { std::vector allLegends; - auto standardLegends = m_standardColorLegends.childObjects(); + auto standardLegends = m_standardColorLegends.children(); for ( auto l : standardLegends ) { allLegends.push_back( l ); } - auto customLegends = m_customColorLegends.childObjects(); + auto customLegends = m_customColorLegends.children(); for ( auto l : customLegends ) { allLegends.push_back( l ); diff --git a/ApplicationLibCode/ProjectDataModel/RimCommandObject.cpp b/ApplicationLibCode/ProjectDataModel/RimCommandObject.cpp index a9c0284551..f732baccb9 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCommandObject.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCommandObject.cpp @@ -265,7 +265,7 @@ void RimCommandIssueFieldChanged::childObjects( caf::PdmObject* pdmObject, std:: size_t fIdx; for ( fIdx = 0; fIdx < fields.size(); ++fIdx ) { - if ( fields[fIdx] ) fields[fIdx]->childObjects( &children ); + if ( fields[fIdx] ) fields[fIdx]->children( &children ); } } @@ -289,7 +289,7 @@ caf::PdmObjectHandle* RimCommandIssueFieldChanged::findObjectByName( caf::PdmObj if ( fields[fIdx] ) { std::vector children; - fields[fIdx]->childObjects( &children ); + fields[fIdx]->children( &children ); for ( size_t cIdx = 0; cIdx < children.size(); cIdx++ ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunction.cpp b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunction.cpp index 7e98c277e0..87b1c1617a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunction.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunction.cpp @@ -80,7 +80,7 @@ RimCustomObjectiveFunctionWeight* RimCustomObjectiveFunction::addWeight() //-------------------------------------------------------------------------------------------------- std::vector RimCustomObjectiveFunction::weights() const { - return m_weights.childObjects(); + return m_weights.children(); } //-------------------------------------------------------------------------------------------------- @@ -350,7 +350,7 @@ RimCustomObjectiveFunctionCollection* RimCustomObjectiveFunction::parentCollecti //-------------------------------------------------------------------------------------------------- RimObjectiveFunction* RimCustomObjectiveFunction::objectiveFunction( RimObjectiveFunction::FunctionType functionType ) const { - for ( auto objectiveFunc : m_objectiveFunctions.childObjects() ) + for ( auto objectiveFunc : m_objectiveFunctions.children() ) { if ( objectiveFunc->functionType() == functionType ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.cpp index a4b3f46fb4..2826d0aa38 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionCollection.cpp @@ -58,7 +58,7 @@ void RimCustomObjectiveFunctionCollection::onObjectiveFunctionChanged( RimCustom //-------------------------------------------------------------------------------------------------- std::vector RimCustomObjectiveFunctionCollection::objectiveFunctions() const { - return m_objectiveFunctions.childObjects(); + return m_objectiveFunctions.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp index 103e56379c..98a4f0c0eb 100644 --- a/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunctionWeight.cpp @@ -155,7 +155,7 @@ void RimCustomObjectiveFunctionWeight::fieldChangedByUi( const caf::PdmFieldHand RimSummaryCaseCollection* candidateEnsemble = parentCurveSet()->summaryCaseCollection(); std::vector candidateAddresses; - for ( auto address : m_objectiveValuesSummaryAddresses().childObjects() ) + for ( auto address : m_objectiveValuesSummaryAddresses().children() ) { candidateAddresses.push_back( address->address() ); } @@ -167,7 +167,7 @@ void RimCustomObjectiveFunctionWeight::fieldChangedByUi( const caf::PdmFieldHand auto curveSelection = dlg.curveSelection(); if ( !curveSelection.empty() ) { - m_objectiveValuesSummaryAddresses.clear(); + m_objectiveValuesSummaryAddresses.clearWithoutDelete(); for ( auto address : curveSelection ) { RimSummaryAddress* summaryAddress = new RimSummaryAddress(); diff --git a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp index 46f79d0976..59045f5ac8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimDepthTrackPlot.cpp @@ -165,7 +165,7 @@ RimDepthTrackPlot::~RimDepthTrackPlot() delete m_nameConfig; removeMdiWindowFromMdiArea(); - m_plots.deleteAllChildObjects(); + m_plots.deleteChildren(); cleanupBeforeClose(); } @@ -178,8 +178,8 @@ RimDepthTrackPlot& RimDepthTrackPlot::operator=( RimDepthTrackPlot&& rhs ) RimPlotWindow::operator=( std::move( rhs ) ); // Move all tracks - auto plots = rhs.m_plots.childObjects(); - rhs.m_plots.clear(); + auto plots = rhs.m_plots.children(); + rhs.m_plots.clearWithoutDelete(); for ( auto plot : plots ) { m_plots.push_back( plot ); @@ -190,7 +190,7 @@ RimDepthTrackPlot& RimDepthTrackPlot::operator=( RimDepthTrackPlot&& rhs ) // They had their own description at top level which we don't want to overwrite. auto dataSource = rhs.m_commonDataSource(); - rhs.m_commonDataSource.removeChildObject( dataSource ); + rhs.m_commonDataSource.removeChild( dataSource ); m_commonDataSource = dataSource; m_commonDataSourceEnabled = rhs.m_commonDataSourceEnabled; @@ -270,7 +270,7 @@ std::vector RimDepthTrackPlot::plots() const { std::vector baseClassPlots; - for ( auto p : m_plots.childObjects() ) + for ( auto p : m_plots.children() ) { baseClassPlots.push_back( p ); } @@ -1082,7 +1082,7 @@ void RimDepthTrackPlot::removePlot( RimPlot* plot ) { m_viewer->removePlot( plot->plotWidget() ); } - m_plots.removeChildObject( plot ); + m_plots.removeChild( plot ); onPlotAdditionOrRemoval(); } @@ -1211,7 +1211,7 @@ RiuPlotAxis RimDepthTrackPlot::valueAxis() const //-------------------------------------------------------------------------------------------------- void RimDepthTrackPlot::setAutoScalePropertyValuesEnabled( bool enabled ) { - for ( auto plot : m_plots.childObjects() ) + for ( auto plot : m_plots.children() ) { plot->setAutoScalePropertyValuesEnabled( enabled ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp index 0b82ab025f..e82478abc6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCase.cpp @@ -146,7 +146,7 @@ RimEclipseCase::RimEclipseCase() //-------------------------------------------------------------------------------------------------- RimEclipseCase::~RimEclipseCase() { - reservoirViews.deleteAllChildObjects(); + reservoirViews.deleteChildren(); delete m_matrixModelResults(); delete m_fractureModelResults(); @@ -573,7 +573,7 @@ void RimEclipseCase::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin if ( uiConfigName == "MainWindow.ProjectTree" ) { std::vector children; - reservoirViews.childObjects( &children ); + reservoirViews.children( &children ); for ( auto child : children ) uiTreeOrdering.add( child ); @@ -602,7 +602,7 @@ void RimEclipseCase::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin //-------------------------------------------------------------------------------------------------- void RimEclipseCase::buildChildNodes() { - m_resultAddressCollections.deleteAllChildObjects(); + m_resultAddressCollections.deleteChildren(); std::vector resultTypes = { RiaDefines::ResultCatType::STATIC_NATIVE, RiaDefines::ResultCatType::DYNAMIC_NATIVE, diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCaseCollection.cpp index 39c6234c64..ab21c3210c 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCaseCollection.cpp @@ -67,8 +67,8 @@ void RimEclipseCaseCollection::close() { m_gridCollection->clear(); - cases.deleteAllChildObjects(); - caseGroups.deleteAllChildObjects(); + cases.deleteChildren(); + caseGroups.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -109,7 +109,7 @@ void RimEclipseCaseCollection::removeCaseFromAllGroups( RimEclipseCase* reservoi cg->removeCase( reservoir ); } - cases().removeChildObject( reservoir ); + cases().removeChild( reservoir ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp index fed5b0b2be..cc09ddac0f 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp @@ -81,7 +81,7 @@ RimEclipseCellColors::~RimEclipseCellColors() { CVF_ASSERT( obsoleteField_legendConfig() == nullptr ); - m_legendConfigData.deleteAllChildObjects(); + m_legendConfigData.deleteChildren(); delete m_ternaryLegendConfig(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapViewCollection.cpp index 45ffa07d81..d806f069be 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseContourMapViewCollection.cpp @@ -28,7 +28,7 @@ RimEclipseContourMapViewCollection::~RimEclipseContourMapViewCollection() //-------------------------------------------------------------------------------------------------- std::vector RimEclipseContourMapViewCollection::views() { - return m_contourMapViews.childObjects(); + return m_contourMapViews.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp index 3ec265b115..ce479cf7e4 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseInputPropertyCollection.cpp @@ -42,7 +42,7 @@ RimEclipseInputPropertyCollection::RimEclipseInputPropertyCollection() //-------------------------------------------------------------------------------------------------- RimEclipseInputPropertyCollection::~RimEclipseInputPropertyCollection() { - inputProperties.deleteAllChildObjects(); + inputProperties.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp index 5d64d76437..a6f8b85b38 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -487,8 +487,8 @@ cvf::ref RimEclipseResultCase::createMockModel( QString mode //-------------------------------------------------------------------------------------------------- RimEclipseResultCase::~RimEclipseResultCase() { - reservoirViews.deleteAllChildObjects(); - m_flowDiagSolutions.deleteAllChildObjects(); + reservoirViews.deleteChildren(); + m_flowDiagSolutions.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp index 14d03c2fa4..586a7b9058 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp @@ -556,7 +556,7 @@ void RimEclipseStatisticsCase::fieldChangedByUi( const caf::PdmFieldHandle* chan RimEclipseView* reservoirView = reservoirViews()[i]; CVF_ASSERT( reservoirView ); - reservoirView->wellCollection()->wells.deleteAllChildObjects(); + reservoirView->wellCollection()->wells.deleteChildren(); reservoirView->updateDisplayModelForWellResults(); reservoirView->wellCollection()->updateConnectedEditors(); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp index f414b44cf1..1237dde0b0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCaseCollection.cpp @@ -42,7 +42,7 @@ RimEclipseStatisticsCaseCollection::RimEclipseStatisticsCaseCollection() //-------------------------------------------------------------------------------------------------- RimEclipseStatisticsCaseCollection::~RimEclipseStatisticsCaseCollection() { - cases.deleteAllChildObjects(); + cases.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp index c25bcb2b07..f403c5f8c8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp @@ -1627,7 +1627,7 @@ void RimEclipseView::syncronizeWellsWithResults() delete well; } } - this->wellCollection()->wells().clear(); + this->wellCollection()->wells().clearWithoutDelete(); // Set the new wells into the field. this->wellCollection()->wells().insert( 0, newWells ); diff --git a/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlotCollection.cpp index cec620b09c..ee31a31207 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEnsembleFractureStatisticsPlotCollection.cpp @@ -69,7 +69,7 @@ void RimEnsembleFractureStatisticsPlotCollection::addEnsembleFractureStatisticsP std::vector RimEnsembleFractureStatisticsPlotCollection::ensembleFractureStatisticsPlots() const { - return m_ensembleFractureStatisticsPlots.childObjects(); + return m_ensembleFractureStatisticsPlots.children(); } //-------------------------------------------------------------------------------------------------- @@ -77,5 +77,5 @@ std::vector //-------------------------------------------------------------------------------------------------- void RimEnsembleFractureStatisticsPlotCollection::deleteAllPlots() { - m_ensembleFractureStatisticsPlots.deleteAllChildObjects(); + m_ensembleFractureStatisticsPlots.deleteChildren(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp index 4fdf3f80ce..166be30358 100644 --- a/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimFormationNamesCollection.cpp @@ -42,7 +42,7 @@ RimFormationNamesCollection::RimFormationNamesCollection() //-------------------------------------------------------------------------------------------------- RimFormationNamesCollection::~RimFormationNamesCollection() { - m_formationNamesList.deleteAllChildObjects(); + m_formationNamesList.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -109,7 +109,7 @@ std::vector RimFormationNamesCollection::importFiles( const RiaLogging::errorInMessageBox( nullptr, "Import Formation Names", totalErrorMessage ); } - return m_formationNamesList.childObjects(); + return m_formationNamesList.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimGridCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimGridCollection.cpp index 485031fcc7..e5a35b2085 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridCollection.cpp @@ -182,7 +182,7 @@ void RimGridInfoCollection::addGridInfo( RimGridInfo* gridInfo ) //-------------------------------------------------------------------------------------------------- void RimGridInfoCollection::clear() { - m_gridInfos.deleteAllChildObjects(); + m_gridInfos.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -219,7 +219,7 @@ void RimGridInfoCollection::deleteGridInfo( const QString& gridName ) //-------------------------------------------------------------------------------------------------- std::vector RimGridInfoCollection::gridInfos() const { - return m_gridInfos.childObjects(); + return m_gridInfos.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp index 6ee0ebd10e..2298cf558c 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlot.cpp @@ -193,7 +193,7 @@ QList RimGridStatisticsPlot::calculateValueOptions( cons if ( eclipseCase ) { options.push_back( caf::PdmOptionItemInfo( "Disabled", nullptr ) ); - for ( RimEclipseView* view : eclipseCase->reservoirViews.childObjects() ) + for ( RimEclipseView* view : eclipseCase->reservoirViews.children() ) { CVF_ASSERT( view && "Really always should have a valid view pointer in ReservoirViews" ); options.push_back( caf::PdmOptionItemInfo( view->name(), view, false, view->uiIconProvider() ) ); diff --git a/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlotCollection.cpp index 31ad011bce..801271794c 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridStatisticsPlotCollection.cpp @@ -68,7 +68,7 @@ void RimGridStatisticsPlotCollection::addGridStatisticsPlot( RimGridStatisticsPl //-------------------------------------------------------------------------------------------------- std::vector RimGridStatisticsPlotCollection::gridStatisticsPlots() const { - return m_gridStatisticsPlots.childObjects(); + return m_gridStatisticsPlots.children(); } //-------------------------------------------------------------------------------------------------- @@ -76,5 +76,5 @@ std::vector RimGridStatisticsPlotCollection::gridStatist //-------------------------------------------------------------------------------------------------- void RimGridStatisticsPlotCollection::deleteAllPlots() { - m_gridStatisticsPlots.deleteAllChildObjects(); + m_gridStatisticsPlots.deleteChildren(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimGridView.cpp b/ApplicationLibCode/ProjectDataModel/RimGridView.cpp index 8f51d95cb9..3301ded5e8 100644 --- a/ApplicationLibCode/ProjectDataModel/RimGridView.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimGridView.cpp @@ -299,7 +299,7 @@ void RimGridView::replaceCellFilterCollectionWithOverride() // Must call removeChildObject() to make sure the object has no parent // No parent is required when assigning a object into a field - m_overrideCellFilterCollection.removeChildObject( overrideRfc ); + m_overrideCellFilterCollection.removeChild( overrideRfc ); m_cellFilterCollection = overrideRfc; diff --git a/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index 800d2b53c0..63836de8b0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -140,7 +140,7 @@ void RimIdenticalGridCaseGroup::removeCase( RimEclipseCase* reservoir ) return; } - caseCollection()->reservoirs().removeChildObject( reservoir ); + caseCollection()->reservoirs().removeChild( reservoir ); if ( caseCollection()->reservoirs().size() == 0 ) { @@ -244,9 +244,7 @@ void RimIdenticalGridCaseGroup::loadMainCaseAndActiveCellInfo() computeUnionOfActiveCells(); } - RigCaseCellResultsData::copyResultsMetaDataFromMainCase( rigCaseData, - poroModel, - caseCollection->reservoirs.childObjects() ); + RigCaseCellResultsData::copyResultsMetaDataFromMainCase( rigCaseData, poroModel, caseCollection->reservoirs.children() ); // "Load" the statistical cases diff --git a/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp b/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp index 48c47c656f..03dadeba68 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMultiPlot.cpp @@ -89,7 +89,7 @@ RimMultiPlot::~RimMultiPlot() m_isValid = false; removeMdiWindowFromMdiArea(); - m_plots.deleteAllChildObjects(); + m_plots.deleteChildren(); cleanupBeforeClose(); } @@ -102,8 +102,8 @@ RimMultiPlot& RimMultiPlot::operator=( RimMultiPlot&& rhs ) RimPlotWindow::operator=( std::move( rhs ) ); // Move all tracks - std::vector plots = rhs.m_plots.childObjects(); - rhs.m_plots.clear(); + std::vector plots = rhs.m_plots.children(); + rhs.m_plots.clearWithoutDelete(); for ( RimPlot* plot : plots ) { m_plots.push_back( plot ); @@ -218,7 +218,7 @@ void RimMultiPlot::removePlot( RimPlot* plot ) { m_viewer->removePlot( plot->plotWidget() ); } - m_plots.removeChildObject( plot ); + m_plots.removeChild( plot ); onPlotAdditionOrRemoval(); } @@ -235,7 +235,7 @@ void RimMultiPlot::removePlotNoUpdate( RimPlot* plot ) { m_viewer->removePlotNoUpdate( plot->plotWidget() ); } - m_plots.removeChildObject( plot ); + m_plots.removeChild( plot ); } } @@ -295,7 +295,7 @@ void RimMultiPlot::deleteAllPlots() } } - m_plots.deleteAllChildObjects(); + m_plots.deleteChildren(); onPlotAdditionOrRemoval(); } @@ -320,7 +320,7 @@ size_t RimMultiPlot::plotIndex( const RimPlot* plot ) const //-------------------------------------------------------------------------------------------------- std::vector RimMultiPlot::plots() const { - return m_plots.childObjects(); + return m_plots.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimMultiPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimMultiPlotCollection.cpp index 8346816a65..02cf7e86ff 100644 --- a/ApplicationLibCode/ProjectDataModel/RimMultiPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimMultiPlotCollection.cpp @@ -48,7 +48,7 @@ RimMultiPlotCollection::~RimMultiPlotCollection() //-------------------------------------------------------------------------------------------------- void RimMultiPlotCollection::deleteAllPlots() { - m_multiPlots.deleteAllChildObjects(); + m_multiPlots.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -56,7 +56,7 @@ void RimMultiPlotCollection::deleteAllPlots() //-------------------------------------------------------------------------------------------------- std::vector RimMultiPlotCollection::multiPlots() const { - return m_multiPlots.childObjects(); + return m_multiPlots.children(); } //-------------------------------------------------------------------------------------------------- @@ -72,7 +72,7 @@ void RimMultiPlotCollection::addMultiPlot( RimMultiPlot* plot ) //-------------------------------------------------------------------------------------------------- void RimMultiPlotCollection::loadDataAndUpdateAllPlots() { - for ( const auto& p : m_multiPlots.childObjects() ) + for ( const auto& p : m_multiPlots.children() ) p->loadDataAndUpdate(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp index 4d0a3322ce..7b7bc9d88d 100644 --- a/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp @@ -61,8 +61,8 @@ RimObservedDataCollection::RimObservedDataCollection() //-------------------------------------------------------------------------------------------------- RimObservedDataCollection::~RimObservedDataCollection() { - m_observedDataArray.deleteAllChildObjects(); - m_observedFmuRftArray.deleteAllChildObjects(); + m_observedDataArray.deleteChildren(); + m_observedFmuRftArray.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -70,7 +70,7 @@ RimObservedDataCollection::~RimObservedDataCollection() //-------------------------------------------------------------------------------------------------- void RimObservedDataCollection::removeObservedSummaryData( RimObservedSummaryData* observedData ) { - m_observedDataArray.removeChildObject( observedData ); + m_observedDataArray.removeChild( observedData ); caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors(); } @@ -79,7 +79,7 @@ void RimObservedDataCollection::removeObservedSummaryData( RimObservedSummaryDat //-------------------------------------------------------------------------------------------------- void RimObservedDataCollection::removeObservedFmuRftData( RimObservedFmuRftData* observedFmuRftData ) { - m_observedFmuRftArray.removeChildObject( observedFmuRftData ); + m_observedFmuRftArray.removeChild( observedFmuRftData ); caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors(); } @@ -88,7 +88,7 @@ void RimObservedDataCollection::removeObservedFmuRftData( RimObservedFmuRftData* //-------------------------------------------------------------------------------------------------- std::vector RimObservedDataCollection::allObservedSummaryData() const { - return m_observedDataArray.childObjects(); + return m_observedDataArray.children(); } //-------------------------------------------------------------------------------------------------- @@ -96,7 +96,7 @@ std::vector RimObservedDataCollection::allObservedSumma //-------------------------------------------------------------------------------------------------- std::vector RimObservedDataCollection::allObservedFmuRftData() const { - return m_observedFmuRftArray.childObjects(); + return m_observedFmuRftArray.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimOilField.cpp b/ApplicationLibCode/ProjectDataModel/RimOilField.cpp index ad2cba145a..df23c0b9ba 100644 --- a/ApplicationLibCode/ProjectDataModel/RimOilField.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimOilField.cpp @@ -126,7 +126,7 @@ void RimOilField::initAfterRead() RimFractureTemplateCollection* fractureTemplateCollection = m_fractureTemplateCollection_OBSOLETE.value(); if ( !fractureTemplateCollection->fractureTemplates().empty() ) { - m_fractureTemplateCollection_OBSOLETE.removeChildObject( fractureTemplateCollection ); + m_fractureTemplateCollection_OBSOLETE.removeChild( fractureTemplateCollection ); completionTemplateCollection->setFractureTemplateCollection( fractureTemplateCollection ); } } diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp b/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp index 26334541fc..d6a20d57f1 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp @@ -409,7 +409,7 @@ bool RimPlotAxisProperties::isAxisInverted() const //-------------------------------------------------------------------------------------------------- std::vector RimPlotAxisProperties::annotations() const { - return m_annotations.childObjects(); + return m_annotations.children(); } //-------------------------------------------------------------------------------------------------- @@ -425,7 +425,7 @@ void RimPlotAxisProperties::appendAnnotation( RimPlotAxisAnnotation* annotation //-------------------------------------------------------------------------------------------------- void RimPlotAxisProperties::removeAllAnnotations() { - m_annotations.clear(); + m_annotations.clearWithoutDelete(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.cpp index 9c8a1e3b41..b095f8edcc 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPltPlotCollection.cpp @@ -50,7 +50,7 @@ RimPltPlotCollection::RimPltPlotCollection() //-------------------------------------------------------------------------------------------------- RimPltPlotCollection::~RimPltPlotCollection() { - m_pltPlots.deleteAllChildObjects(); + m_pltPlots.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -246,7 +246,7 @@ void RimPltPlotCollection::addPlot( gsl::not_null newPlot ) //-------------------------------------------------------------------------------------------------- void RimPltPlotCollection::removePlot( gsl::not_null plot ) { - m_pltPlots.removeChildObject( plot ); + m_pltPlots.removeChild( plot ); updateAllRequiredEditors(); } @@ -255,5 +255,5 @@ void RimPltPlotCollection::removePlot( gsl::not_null plot ) //-------------------------------------------------------------------------------------------------- void RimPltPlotCollection::deleteAllPlots() { - m_pltPlots.deleteAllChildObjects(); + m_pltPlots.deleteChildren(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimProject.cpp b/ApplicationLibCode/ProjectDataModel/RimProject.cpp index af1c343b94..cc5cd25974 100644 --- a/ApplicationLibCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimProject.cpp @@ -249,17 +249,17 @@ void RimProject::close() mainPlotCollection()->deleteAllContainedObjects(); } - oilFields.deleteAllChildObjects(); + oilFields.deleteChildren(); oilFields.push_back( new RimOilField ); - casesObsolete.deleteAllChildObjects(); - caseGroupsObsolete.deleteAllChildObjects(); + casesObsolete.deleteChildren(); + caseGroupsObsolete.deleteChildren(); - wellPathImport->regions().deleteAllChildObjects(); + wellPathImport->regions().deleteChildren(); - commandObjects.deleteAllChildObjects(); + commandObjects.deleteChildren(); - multiSnapshotDefinitions.deleteAllChildObjects(); + multiSnapshotDefinitions.deleteChildren(); m_dialogData->clearProjectSpecificData(); @@ -314,7 +314,7 @@ void RimProject::initAfterRead() if ( movedOneRimIdenticalGridCaseGroup ) { - caseGroupsObsolete.clear(); + caseGroupsObsolete.clearWithoutDelete(); } bool movedOneRimCase = false; @@ -331,7 +331,7 @@ void RimProject::initAfterRead() if ( movedOneRimCase ) { - casesObsolete.clear(); + casesObsolete.clearWithoutDelete(); } // Set project pointer to each well path @@ -378,8 +378,8 @@ bool RimProject::writeProjectFile() //-------------------------------------------------------------------------------------------------- void RimProject::setScriptDirectories( const QString& scriptDirectories ) { - scriptCollection->calcScripts().deleteAllChildObjects(); - scriptCollection->subDirectories().deleteAllChildObjects(); + scriptCollection->calcScripts().deleteChildren(); + scriptCollection->subDirectories().deleteChildren(); QStringList pathList = scriptDirectories.split( ';' ); foreach ( QString path, pathList ) diff --git a/ApplicationLibCode/ProjectDataModel/RimProject.h b/ApplicationLibCode/ProjectDataModel/RimProject.h index aab3fc169c..b6f7beb7ec 100644 --- a/ApplicationLibCode/ProjectDataModel/RimProject.h +++ b/ApplicationLibCode/ProjectDataModel/RimProject.h @@ -261,7 +261,7 @@ void RimProject::fieldContentsByType( const caf::PdmObjectHandle* object, std::v } } - field->childObjects( &children ); + field->children( &children ); } for ( const auto& child : children ) diff --git a/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp b/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp index e917bf6aa2..c6adfbe8a6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimReservoirCellResultsStorage.cpp @@ -64,7 +64,7 @@ RimReservoirCellResultsStorage::RimReservoirCellResultsStorage() //-------------------------------------------------------------------------------------------------- RimReservoirCellResultsStorage::~RimReservoirCellResultsStorage() { - m_resultCacheMetaData.deleteAllChildObjects(); + m_resultCacheMetaData.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -77,7 +77,7 @@ RimReservoirCellResultsStorage::~RimReservoirCellResultsStorage() //-------------------------------------------------------------------------------------------------- void RimReservoirCellResultsStorage::setupBeforeSave() { - m_resultCacheMetaData.deleteAllChildObjects(); + m_resultCacheMetaData.deleteChildren(); QString newValidCacheFileName = getValidCacheFileName(); // Delete the storage file diff --git a/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.cpp index b6cb68fc8d..39e9a51bcd 100644 --- a/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimRftPlotCollection.cpp @@ -50,7 +50,7 @@ RimRftPlotCollection::RimRftPlotCollection() //-------------------------------------------------------------------------------------------------- RimRftPlotCollection::~RimRftPlotCollection() { - m_rftPlots.deleteAllChildObjects(); + m_rftPlots.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -246,7 +246,7 @@ void RimRftPlotCollection::addPlot( gsl::not_null newPlot ) //-------------------------------------------------------------------------------------------------- void RimRftPlotCollection::removePlot( gsl::not_null plot ) { - m_rftPlots.removeChildObject( plot ); + m_rftPlots.removeChild( plot ); updateAllRequiredEditors(); } @@ -255,5 +255,5 @@ void RimRftPlotCollection::removePlot( gsl::not_null plot ) //-------------------------------------------------------------------------------------------------- void RimRftPlotCollection::deleteAllPlots() { - m_rftPlots.deleteAllChildObjects(); + m_rftPlots.deleteChildren(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp index 8ebe37ebb8..f50221705e 100644 --- a/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimScriptCollection.cpp @@ -53,8 +53,8 @@ RimScriptCollection::RimScriptCollection() //-------------------------------------------------------------------------------------------------- RimScriptCollection::~RimScriptCollection() { - calcScripts.deleteAllChildObjects(); - subDirectories.deleteAllChildObjects(); + calcScripts.deleteChildren(); + subDirectories.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -62,7 +62,7 @@ RimScriptCollection::~RimScriptCollection() //-------------------------------------------------------------------------------------------------- void RimScriptCollection::readContentFromDisc() { - calcScripts.deleteAllChildObjects(); + calcScripts.deleteChildren(); if ( directory().isEmpty() ) { @@ -104,7 +104,7 @@ void RimScriptCollection::readContentFromDisc() } } - subDirectories.deleteAllChildObjects(); + subDirectories.deleteChildren(); if ( m_searchSubFolders() ) { diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp index 7a092a03a5..c428dfae2f 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewCollection.cpp @@ -245,7 +245,7 @@ RimSimWellInViewCollection::RimSimWellInViewCollection() //-------------------------------------------------------------------------------------------------- RimSimWellInViewCollection::~RimSimWellInViewCollection() { - wells.deleteAllChildObjects(); + wells.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimStimPlanColors.cpp b/ApplicationLibCode/ProjectDataModel/RimStimPlanColors.cpp index ef5c266400..df1592856a 100644 --- a/ApplicationLibCode/ProjectDataModel/RimStimPlanColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimStimPlanColors.cpp @@ -125,7 +125,7 @@ void RimStimPlanColors::loadDataAndUpdate() for ( auto legend : toBeDeleted ) { - m_legendConfigurations.removeChildObject( legend ); + m_legendConfigurations.removeChild( legend ); delete legend; } diff --git a/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionBand.cpp b/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionBand.cpp index e0bc93d4cb..8948c55391 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionBand.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionBand.cpp @@ -79,7 +79,7 @@ RimSurfaceIntersectionBand::RimSurfaceIntersectionBand() //-------------------------------------------------------------------------------------------------- void RimSurfaceIntersectionBand::setSurfaces( RimSurface* surface1, RimSurface* surface2 ) { - m_surfaces.clear(); + m_surfaces.clearWithoutDelete(); m_surfaces.push_back( surface1 ); m_surfaces.push_back( surface2 ); diff --git a/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCollection.cpp index 87f2c06d56..259a053e2b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSurfaceIntersectionCollection.cpp @@ -64,7 +64,7 @@ RimSurfaceIntersectionBand* RimSurfaceIntersectionCollection::addIntersectionBan //-------------------------------------------------------------------------------------------------- std::vector RimSurfaceIntersectionCollection::surfaceIntersectionCurves() const { - return m_intersectionCurves.childObjects(); + return m_intersectionCurves.children(); } //-------------------------------------------------------------------------------------------------- @@ -72,7 +72,7 @@ std::vector RimSurfaceIntersectionCollection::surf //-------------------------------------------------------------------------------------------------- std::vector RimSurfaceIntersectionCollection::surfaceIntersectionBands() const { - return m_intersectionBands.childObjects(); + return m_intersectionBands.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculation.cpp b/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculation.cpp index ef54a26a9d..ed65791696 100644 --- a/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculation.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculation.cpp @@ -129,7 +129,7 @@ RimUserDefinedCalculationVariable* RimUserDefinedCalculation::addVariable( const //-------------------------------------------------------------------------------------------------- void RimUserDefinedCalculation::deleteVariable( RimUserDefinedCalculationVariable* calcVariable ) { - m_variables.removeChildObject( calcVariable ); + m_variables.removeChild( calcVariable ); delete calcVariable; } @@ -374,5 +374,5 @@ void RimUserDefinedCalculation::defineEditorAttribute( const caf::PdmFieldHandle //-------------------------------------------------------------------------------------------------- std::vector RimUserDefinedCalculation::allVariables() const { - return m_variables.childObjects(); + return m_variables.children(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculationCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculationCollection.cpp index 13a6c5a189..c22ec8a02d 100644 --- a/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculationCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculationCollection.cpp @@ -103,7 +103,7 @@ RimUserDefinedCalculation* void RimUserDefinedCalculationCollection::deleteCalculation( RimUserDefinedCalculation* calculation ) { calculation->removeDependentObjects(); - m_calculations.removeChildObject( calculation ); + m_calculations.removeChild( calculation ); rebuildCaseMetaData(); @@ -115,7 +115,7 @@ void RimUserDefinedCalculationCollection::deleteCalculation( RimUserDefinedCalcu //-------------------------------------------------------------------------------------------------- std::vector RimUserDefinedCalculationCollection::calculations() const { - return m_calculations.childObjects(); + return m_calculations.children(); } //-------------------------------------------------------------------------------------------------- @@ -139,7 +139,7 @@ RimUserDefinedCalculation* RimUserDefinedCalculationCollection::findCalculationB //-------------------------------------------------------------------------------------------------- void RimUserDefinedCalculationCollection::deleteAllContainedObjects() { - m_calculations.deleteAllChildObjects(); + m_calculations.deleteChildren(); rebuildCaseMetaData(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.cpp index 572872bf9e..fbfe6757c6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.cpp @@ -70,15 +70,15 @@ void RimVfpPlotCollection::insertPlot( RimVfpPlot* vfpPlot, size_t index ) //-------------------------------------------------------------------------------------------------- std::vector RimVfpPlotCollection::plots() const { - return m_vfpPlots.childObjects(); + return m_vfpPlots.children(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimVfpPlotCollection::deleteAllChildObjects() +void RimVfpPlotCollection::deleteChildren() { - m_vfpPlots.deleteAllChildObjects(); + m_vfpPlots.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -94,6 +94,6 @@ size_t RimVfpPlotCollection::plotCount() const //-------------------------------------------------------------------------------------------------- void RimVfpPlotCollection::removePlot( RimVfpPlot* vfpPlot ) { - m_vfpPlots.removeChildObject( vfpPlot ); + m_vfpPlots.removeChild( vfpPlot ); updateAllRequiredEditors(); } diff --git a/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.h b/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.h index 9ea6ebfb4f..b8dda7b337 100644 --- a/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.h +++ b/ApplicationLibCode/ProjectDataModel/RimVfpPlotCollection.h @@ -37,7 +37,7 @@ public: void addPlot( RimVfpPlot* newPlot ) override; std::vector plots() const override; - void deleteAllChildObjects(); + void deleteChildren(); size_t plotCount() const final; void insertPlot( RimVfpPlot* vfpPlot, size_t index ) final; diff --git a/ApplicationLibCode/ProjectDataModel/RimViewLinker.cpp b/ApplicationLibCode/ProjectDataModel/RimViewLinker.cpp index f53b725bc4..dc31bc5b50 100644 --- a/ApplicationLibCode/ProjectDataModel/RimViewLinker.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimViewLinker.cpp @@ -84,7 +84,7 @@ RimViewLinker::~RimViewLinker() { removeOverrides(); - m_viewControllers.deleteAllChildObjects(); + m_viewControllers.deleteChildren(); RimGridView* masterView = m_masterView; m_masterView = nullptr; if ( masterView ) masterView->updateAutoName(); @@ -313,7 +313,7 @@ void RimViewLinker::setMasterView( RimGridView* view ) if ( previousViewController ) { delete previousViewController; - this->m_viewControllers.removeChildObject( nullptr ); + this->m_viewControllers.removeChild( nullptr ); } this->removeOverrides(); @@ -673,7 +673,7 @@ void RimViewLinker::updatePropertyFilters( RimPropertyFilter* changedPropertyFil //-------------------------------------------------------------------------------------------------- void RimViewLinker::removeViewController( RimViewController* viewController ) { - m_viewControllers.removeChildObject( viewController ); + m_viewControllers.removeChild( viewController ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.cpp index 43747d7eeb..0374784fc5 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticPropertyScalingCollection.cpp @@ -43,7 +43,7 @@ RimElasticPropertyScalingCollection::RimElasticPropertyScalingCollection() //-------------------------------------------------------------------------------------------------- RimElasticPropertyScalingCollection::~RimElasticPropertyScalingCollection() { - m_elasticPropertyScalings.deleteAllChildObjects(); + m_elasticPropertyScalings.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.cpp index 475987b080..b2af83afab 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimPressureTable.cpp @@ -56,7 +56,7 @@ RimPressureTable::~RimPressureTable() //-------------------------------------------------------------------------------------------------- std::vector RimPressureTable::items() const { - std::vector pressureTableItems = m_pressureTableItems.childObjects(); + std::vector pressureTableItems = m_pressureTableItems.children(); // Sort by depth std::sort( pressureTableItems.begin(), pressureTableItems.end(), []( auto const& a, auto const& b ) { @@ -86,7 +86,7 @@ void RimPressureTable::insertItem( RimPressureTableItem* insertBefore, RimPressu //-------------------------------------------------------------------------------------------------- void RimPressureTable::deleteItem( RimPressureTableItem* itemToDelete ) { - m_pressureTableItems.removeChildObject( itemToDelete ); + m_pressureTableItems.removeChild( itemToDelete ); delete itemToDelete; onTableChanged(); } @@ -96,7 +96,7 @@ void RimPressureTable::deleteItem( RimPressureTableItem* itemToDelete ) //-------------------------------------------------------------------------------------------------- void RimPressureTable::deleteAllItems() { - m_pressureTableItems.deleteAllChildObjects(); + m_pressureTableItems.deleteChildren(); onTableChanged(); } diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.cpp index 742bfdf81b..0411185e9f 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelCollection.cpp @@ -69,7 +69,7 @@ void RimStimPlanModelCollection::addStimPlanModel( RimStimPlanModel* fracture ) //-------------------------------------------------------------------------------------------------- void RimStimPlanModelCollection::deleteStimPlanModels() { - m_stimPlanModels.deleteAllChildObjects(); + m_stimPlanModels.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -77,7 +77,7 @@ void RimStimPlanModelCollection::deleteStimPlanModels() //-------------------------------------------------------------------------------------------------- std::vector RimStimPlanModelCollection::allStimPlanModels() const { - return m_stimPlanModels.childObjects(); + return m_stimPlanModels.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp index 4819a52729..a8803038bf 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelPlotCollection.cpp @@ -41,7 +41,7 @@ RimStimPlanModelPlotCollection::RimStimPlanModelPlotCollection() //-------------------------------------------------------------------------------------------------- RimStimPlanModelPlotCollection::~RimStimPlanModelPlotCollection() { - m_stimPlanModelPlots.deleteAllChildObjects(); + m_stimPlanModelPlots.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -76,7 +76,7 @@ void RimStimPlanModelPlotCollection::addStimPlanModelPlot( RimStimPlanModelPlot* //-------------------------------------------------------------------------------------------------- std::vector RimStimPlanModelPlotCollection::stimPlanModelPlots() const { - return m_stimPlanModelPlots.childObjects(); + return m_stimPlanModelPlots.children(); } //-------------------------------------------------------------------------------------------------- @@ -84,5 +84,5 @@ std::vector RimStimPlanModelPlotCollection::stimPlanModel //-------------------------------------------------------------------------------------------------- void RimStimPlanModelPlotCollection::deleteAllPlots() { - m_stimPlanModelPlots.deleteAllChildObjects(); + m_stimPlanModelPlots.deleteChildren(); } diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp index 291caf0a6e..8f220d694d 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplate.cpp @@ -511,7 +511,7 @@ void RimStimPlanModelTemplate::initAfterRead() m_faciesProperties->setEclipseCase( eclipseCase ); } - for ( auto& fipConfig : m_faciesInitialPressureConfigs.childObjects() ) + for ( auto& fipConfig : m_faciesInitialPressureConfigs.children() ) { fipConfig->changed.connect( this, &RimStimPlanModelTemplate::faciesPropertiesChanged ); } @@ -837,7 +837,7 @@ RimEclipseCase* RimStimPlanModelTemplate::initialPressureEclipseCase() const std::map RimStimPlanModelTemplate::faciesWithInitialPressure() const { std::map valueFractionMap; - for ( const RimFaciesInitialPressureConfig* c : m_faciesInitialPressureConfigs.childObjects() ) + for ( const RimFaciesInitialPressureConfig* c : m_faciesInitialPressureConfigs.children() ) { if ( c->isEnabled() ) valueFractionMap[c->faciesValue()] = c->fraction(); } diff --git a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp index c50c4e09cb..b695e5f0d0 100644 --- a/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/StimPlanModel/RimStimPlanModelTemplateCollection.cpp @@ -50,7 +50,7 @@ RimStimPlanModelTemplateCollection::RimStimPlanModelTemplateCollection() //-------------------------------------------------------------------------------------------------- RimStimPlanModelTemplateCollection::~RimStimPlanModelTemplateCollection() { - m_stimPlanModelTemplates.deleteAllChildObjects(); + m_stimPlanModelTemplates.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamlineInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamlineInViewCollection.cpp index ec85c72e97..27d6f00861 100644 --- a/ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamlineInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Streamlines/RimStreamlineInViewCollection.cpp @@ -441,7 +441,7 @@ void RimStreamlineInViewCollection::updateStreamlines() if ( m_shouldGenerateTracers && isActive() ) { // reset generated streamlines - m_streamlines().clear(); + m_streamlines().clearWithoutDelete(); m_wellCellIds.clear(); // get current simulation timestep diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp index 7d778e8433..0651f57040 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp @@ -238,7 +238,7 @@ std::vector RimEnsembleCurveFilter::summaryAddresses() //-------------------------------------------------------------------------------------------------- void RimEnsembleCurveFilter::setSummaryAddresses( std::vector addresses ) { - m_objectiveValuesSummaryAddresses.clear(); + m_objectiveValuesSummaryAddresses.clearWithoutDelete(); for ( auto address : addresses ) { RimSummaryAddress* summaryAddress = new RimSummaryAddress(); @@ -384,7 +384,7 @@ void RimEnsembleCurveFilter::fieldChangedByUi( const caf::PdmFieldHandle* change RimSummaryCaseCollection* candidateEnsemble = parentCurveSet()->summaryCaseCollection(); std::vector candidateAddresses; - for ( auto address : m_objectiveValuesSummaryAddresses().childObjects() ) + for ( auto address : m_objectiveValuesSummaryAddresses().children() ) { candidateAddresses.push_back( address->address() ); } @@ -396,7 +396,7 @@ void RimEnsembleCurveFilter::fieldChangedByUi( const caf::PdmFieldHandle* change auto curveSelection = dlg.curveSelection(); if ( !curveSelection.empty() ) { - m_objectiveValuesSummaryAddresses.clear(); + m_objectiveValuesSummaryAddresses.clearWithoutDelete(); for ( auto address : curveSelection ) { RimSummaryAddress* summaryAddress = new RimSummaryAddress(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp index 9c5feb6a22..d62229c6c6 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp @@ -67,7 +67,7 @@ RimEnsembleCurveFilter* RimEnsembleCurveFilterCollection::addFilter( const QStri //-------------------------------------------------------------------------------------------------- std::vector RimEnsembleCurveFilterCollection::filters() const { - return m_filters.childObjects(); + return m_filters.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp index 9db5ad7871..94424bd1e7 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp @@ -222,7 +222,7 @@ RimEnsembleCurveSet::RimEnsembleCurveSet() //-------------------------------------------------------------------------------------------------- RimEnsembleCurveSet::~RimEnsembleCurveSet() { - m_curves.deleteAllChildObjects(); + m_curves.deleteChildren(); RimSummaryPlot* parentPlot; firstAncestorOrThisOfType( parentPlot ); @@ -373,7 +373,7 @@ void RimEnsembleCurveSet::deleteCurve( RimSummaryCurve* curve ) { if ( curve ) { - m_curves.removeChildObject( curve ); + m_curves.removeChild( curve ); delete curve; } } @@ -402,7 +402,7 @@ RifEclipseSummaryAddress RimEnsembleCurveSet::summaryAddress() const //-------------------------------------------------------------------------------------------------- std::vector RimEnsembleCurveSet::curves() const { - return m_curves.childObjects(); + return m_curves.children(); } //-------------------------------------------------------------------------------------------------- @@ -808,7 +808,7 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi RimSummaryCaseCollection* candidateEnsemble = m_yValuesSummaryCaseCollection(); std::vector candidateAddresses; - for ( auto address : m_objectiveValuesSummaryAddresses().childObjects() ) + for ( auto address : m_objectiveValuesSummaryAddresses().children() ) { candidateAddresses.push_back( address->address() ); } @@ -820,7 +820,7 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi auto curveSelection = dlg.curveSelection(); if ( !curveSelection.empty() ) { - m_objectiveValuesSummaryAddresses.clear(); + m_objectiveValuesSummaryAddresses.clearWithoutDelete(); for ( auto address : curveSelection ) { RimSummaryAddress* summaryAddress = new RimSummaryAddress(); @@ -1385,7 +1385,7 @@ void RimEnsembleCurveSet::updateObjectiveFunctionLegend() if ( m_colorMode() == ColorMode::BY_OBJECTIVE_FUNCTION ) { std::vector addresses; - for ( auto address : m_objectiveValuesSummaryAddresses().childObjects() ) + for ( auto address : m_objectiveValuesSummaryAddresses().children() ) { addresses.push_back( address->address() ); } @@ -1398,7 +1398,7 @@ void RimEnsembleCurveSet::updateObjectiveFunctionLegend() else if ( m_colorMode() == ColorMode::BY_CUSTOM_OBJECTIVE_FUNCTION && m_customObjectiveFunction() ) { std::vector addresses; - for ( auto address : m_objectiveValuesSummaryAddresses().childObjects() ) + for ( auto address : m_objectiveValuesSummaryAddresses().children() ) { addresses.push_back( address->address() ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp index 3e57f0fbae..065f6ae460 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp @@ -60,7 +60,7 @@ RimEnsembleCurveSetCollection::RimEnsembleCurveSetCollection() //-------------------------------------------------------------------------------------------------- RimEnsembleCurveSetCollection::~RimEnsembleCurveSetCollection() { - m_curveSets.deleteAllChildObjects(); + m_curveSets.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -196,7 +196,7 @@ void RimEnsembleCurveSetCollection::deleteCurveSets( const std::vector RimEnsembleCurveSetCollection::curveSets() const { - return m_curveSets.childObjects(); + return m_curveSets.children(); } //-------------------------------------------------------------------------------------------------- @@ -302,7 +302,7 @@ RimSummaryPlotSourceStepping* RimEnsembleCurveSetCollection::sourceSteppingObjec //-------------------------------------------------------------------------------------------------- void RimEnsembleCurveSetCollection::deleteAllCurveSets() { - m_curveSets.deleteAllChildObjects(); + m_curveSets.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp index b57801156b..8389d5f766 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp @@ -333,10 +333,10 @@ RimSummaryAddressCollection* RimSummaryAddressCollection::getOrCreateSubfolder( //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimSummaryAddressCollection::deleteAllChildObjects() +void RimSummaryAddressCollection::deleteChildren() { - m_adresses.deleteAllChildObjects(); - m_subfolders.deleteAllChildObjects(); + m_adresses.deleteChildren(); + m_subfolders.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -444,7 +444,7 @@ int RimSummaryAddressCollection::ensembleId() const //-------------------------------------------------------------------------------------------------- std::vector RimSummaryAddressCollection::subFolders() const { - return m_subfolders.childObjects(); + return m_subfolders.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.h index 62f4f107bd..168131f088 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.h @@ -64,7 +64,7 @@ public: void updateFolderStructure( const std::set& addresses, int caseId, int ensembleId = -1 ); - void deleteAllChildObjects(); + void deleteChildren(); bool isEmpty() const; bool isEnsemble() const; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp index d6d284206a..882a16c6f4 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp @@ -239,7 +239,7 @@ QString RimSummaryCase::errorMessagesFromReader() //-------------------------------------------------------------------------------------------------- void RimSummaryCase::buildChildNodes() { - m_dataVectorFolders->deleteAllChildObjects(); + m_dataVectorFolders->deleteChildren(); RifSummaryReaderInterface* reader = summaryReader(); if ( !reader ) return; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp index f72529846c..0be851e734 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp @@ -144,7 +144,7 @@ RimSummaryCaseCollection::RimSummaryCaseCollection() //-------------------------------------------------------------------------------------------------- RimSummaryCaseCollection::~RimSummaryCaseCollection() { - m_cases.deleteAllChildObjectsAsync(); + m_cases.deleteChildrenAsync(); updateReferringCurveSets(); } @@ -155,7 +155,7 @@ void RimSummaryCaseCollection::removeCase( RimSummaryCase* summaryCase, bool not { size_t caseCountBeforeRemove = m_cases.size(); - m_cases.removeChildObject( summaryCase ); + m_cases.removeChild( summaryCase ); m_cachedSortedEnsembleParameters.clear(); @@ -212,7 +212,7 @@ void RimSummaryCaseCollection::addCase( RimSummaryCase* summaryCase ) //-------------------------------------------------------------------------------------------------- std::vector RimSummaryCaseCollection::allSummaryCases() const { - return m_cases.childObjects(); + return m_cases.children(); } //-------------------------------------------------------------------------------------------------- @@ -1098,5 +1098,5 @@ void RimSummaryCaseCollection::refreshMetaData() //-------------------------------------------------------------------------------------------------- void RimSummaryCaseCollection::clearChildNodes() { - m_dataVectorFolders->deleteAllChildObjects(); + m_dataVectorFolders->deleteChildren(); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp index 76b561e14e..99ed50a838 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp @@ -110,8 +110,8 @@ RimSummaryCaseMainCollection::RimSummaryCaseMainCollection() //-------------------------------------------------------------------------------------------------- RimSummaryCaseMainCollection::~RimSummaryCaseMainCollection() { - m_cases.deleteAllChildObjectsAsync(); - m_caseCollections.deleteAllChildObjectsAsync(); + m_cases.deleteChildrenAsync(); + m_caseCollections.deleteChildrenAsync(); } //-------------------------------------------------------------------------------------------------- @@ -260,7 +260,7 @@ void RimSummaryCaseMainCollection::removeCase( RimSummaryCase* summaryCase, bool } } - m_cases.removeChildObject( summaryCase ); + m_cases.removeChild( summaryCase ); for ( RimSummaryCaseCollection* summaryCaseCollection : m_caseCollections ) { @@ -323,7 +323,7 @@ RimSummaryCaseCollection* } else { - m_cases.removeChildObject( summaryCase ); + m_cases.removeChild( summaryCase ); } summaryCaseCollection->addCase( summaryCase ); @@ -348,7 +348,7 @@ RimSummaryCaseCollection* //-------------------------------------------------------------------------------------------------- void RimSummaryCaseMainCollection::removeCaseCollection( RimSummaryCaseCollection* caseCollection ) { - m_caseCollections.removeChildObject( caseCollection ); + m_caseCollections.removeChild( caseCollection ); dataSourceHasChanged.send(); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCrossPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCrossPlotCollection.cpp index 78735662aa..4b4baa23b9 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCrossPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCrossPlotCollection.cpp @@ -50,7 +50,7 @@ RimSummaryCrossPlotCollection::~RimSummaryCrossPlotCollection() //-------------------------------------------------------------------------------------------------- void RimSummaryCrossPlotCollection::deleteAllPlots() { - m_summaryCrossPlots.deleteAllChildObjects(); + m_summaryCrossPlots.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -58,7 +58,7 @@ void RimSummaryCrossPlotCollection::deleteAllPlots() //-------------------------------------------------------------------------------------------------- std::vector RimSummaryCrossPlotCollection::plots() const { - return m_summaryCrossPlots.childObjects(); + return m_summaryCrossPlots.children(); } //-------------------------------------------------------------------------------------------------- @@ -107,7 +107,7 @@ void RimSummaryCrossPlotCollection::insertPlot( RimSummaryPlot* plot, size_t ind //-------------------------------------------------------------------------------------------------- void RimSummaryCrossPlotCollection::removePlot( RimSummaryPlot* plot ) { - m_summaryCrossPlots.removeChildObject( plot ); + m_summaryCrossPlots.removeChild( plot ); updateAllRequiredEditors(); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp index 0d81461539..553c045716 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp @@ -91,7 +91,7 @@ RimSummaryCurveCollection::RimSummaryCurveCollection() //-------------------------------------------------------------------------------------------------- RimSummaryCurveCollection::~RimSummaryCurveCollection() { - m_curves.deleteAllChildObjects(); + m_curves.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -244,7 +244,7 @@ void RimSummaryCurveCollection::removeCurve( RimSummaryCurve* curve ) { if ( curve ) { - m_curves.removeChildObject( curve ); + m_curves.removeChild( curve ); } } @@ -253,7 +253,7 @@ void RimSummaryCurveCollection::removeCurve( RimSummaryCurve* curve ) //-------------------------------------------------------------------------------------------------- std::vector RimSummaryCurveCollection::curves() const { - return m_curves.childObjects(); + return m_curves.children(); } //-------------------------------------------------------------------------------------------------- @@ -342,7 +342,7 @@ void RimSummaryCurveCollection::deleteCurvesAssosiatedWithCase( RimSummaryCase* } for ( RimSummaryCurve* summaryCurve : summaryCurvesToDelete ) { - m_curves.removeChildObject( summaryCurve ); + m_curves.removeChild( summaryCurve ); delete summaryCurve; } } @@ -352,7 +352,7 @@ void RimSummaryCurveCollection::deleteCurvesAssosiatedWithCase( RimSummaryCase* //-------------------------------------------------------------------------------------------------- void RimSummaryCurveCollection::deleteAllCurves() { - m_curves.deleteAllChildObjects(); + m_curves.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlotCollection.cpp index e84f5582de..e4cc52336d 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlotCollection.cpp @@ -63,7 +63,7 @@ void RimSummaryMultiPlotCollection::initAfterRead() //-------------------------------------------------------------------------------------------------- void RimSummaryMultiPlotCollection::deleteAllPlots() { - m_summaryMultiPlots.deleteAllChildObjects(); + m_summaryMultiPlots.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -71,7 +71,7 @@ void RimSummaryMultiPlotCollection::deleteAllPlots() //-------------------------------------------------------------------------------------------------- std::vector RimSummaryMultiPlotCollection::multiPlots() const { - return m_summaryMultiPlots.childObjects(); + return m_summaryMultiPlots.children(); } //-------------------------------------------------------------------------------------------------- @@ -88,7 +88,7 @@ void RimSummaryMultiPlotCollection::addSummaryMultiPlot( RimSummaryMultiPlot* pl //-------------------------------------------------------------------------------------------------- void RimSummaryMultiPlotCollection::loadDataAndUpdateAllPlots() { - for ( const auto& p : m_summaryMultiPlots.childObjects() ) + for ( const auto& p : m_summaryMultiPlots.children() ) p->loadDataAndUpdate(); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index adb0313a95..86321c182a 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -328,8 +328,8 @@ QString RimSummaryPlot::asciiDataForSummaryPlotExport( RiaDefines::DateTimePerio std::vector curves; this->descendantsIncludingThisOfType( curves ); - auto gridCurves = m_gridTimeHistoryCurves.childObjects(); - auto asciiCurves = m_asciiDataCurves.childObjects(); + auto gridCurves = m_gridTimeHistoryCurves.children(); + auto asciiCurves = m_asciiDataCurves.children(); QString text = RimSummaryCurvesData::createTextForExport( curves, asciiCurves, gridCurves, resamplingPeriod, showTimeAsLongString ); @@ -1344,7 +1344,7 @@ void RimSummaryPlot::addGridTimeHistoryCurveNoUpdate( RimGridTimeHistoryCurve* c //-------------------------------------------------------------------------------------------------- std::vector RimSummaryPlot::gridTimeHistoryCurves() const { - return m_gridTimeHistoryCurves.childObjects(); + return m_gridTimeHistoryCurves.children(); } //-------------------------------------------------------------------------------------------------- @@ -1859,7 +1859,7 @@ void RimSummaryPlot::axisPositionChanged( const caf::SignalEmitter* emitter, if ( oldPlotAxis != RiuPlotAxis::defaultLeft() && oldPlotAxis != RiuPlotAxis::defaultRight() ) { auto oldAxisProperties = axisPropertiesForPlotAxis( oldPlotAxis ); - if ( oldAxisProperties ) m_axisProperties.removeChildObject( oldAxisProperties ); + if ( oldAxisProperties ) m_axisProperties.removeChild( oldAxisProperties ); plotWidget()->moveAxis( oldPlotAxis, newPlotAxis ); } @@ -1875,7 +1875,7 @@ void RimSummaryPlot::axisPositionChanged( const caf::SignalEmitter* emitter, //-------------------------------------------------------------------------------------------------- void RimSummaryPlot::deleteAllGridTimeHistoryCurves() { - m_gridTimeHistoryCurves.deleteAllChildObjects(); + m_gridTimeHistoryCurves.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp index 849f07dc67..b0f48e2e33 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp @@ -120,7 +120,7 @@ void RimSummaryPlotCollection::onChildDeleted( caf::PdmChildArrayFieldHandle* //-------------------------------------------------------------------------------------------------- std::vector RimSummaryPlotCollection::plots() const { - return m_summaryPlots.childObjects(); + return m_summaryPlots.children(); } //-------------------------------------------------------------------------------------------------- @@ -144,6 +144,6 @@ void RimSummaryPlotCollection::insertPlot( RimSummaryPlot* summaryPlot, size_t i //-------------------------------------------------------------------------------------------------- void RimSummaryPlotCollection::removePlot( RimSummaryPlot* summaryPlot ) { - m_summaryPlots.removeChildObject( summaryPlot ); + m_summaryPlots.removeChild( summaryPlot ); updateAllRequiredEditors(); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp index 0b5b99c420..a787a8a2a1 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp @@ -176,7 +176,7 @@ void RimSummaryPlotFilterTextCurveSetEditor::updateTextFilter() if ( !usedSources.empty() ) { - m_selectedSources.clear(); + m_selectedSources.clearWithoutDelete(); m_selectedSources.setValue( usedSources ); } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp index 8b9cda5a31..2217239aaa 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp @@ -516,7 +516,7 @@ RiaDefines::TimeFormatComponents RimSummaryTimeAxisProperties::timeComponents( R //-------------------------------------------------------------------------------------------------- std::vector RimSummaryTimeAxisProperties::annotations() const { - return m_annotations.childObjects(); + return m_annotations.children(); } //-------------------------------------------------------------------------------------------------- @@ -532,7 +532,7 @@ void RimSummaryTimeAxisProperties::appendAnnotation( RimPlotAxisAnnotation* anno //-------------------------------------------------------------------------------------------------- void RimSummaryTimeAxisProperties::removeAllAnnotations() { - m_annotations.clear(); + m_annotations.clearWithoutDelete(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp index 252604cc72..c94cbf2d31 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp @@ -269,7 +269,7 @@ RimSurface* RimSurfaceCollection::addGridCaseSurface( RimCase* sourceCase, int o //-------------------------------------------------------------------------------------------------- std::vector RimSurfaceCollection::surfaces() const { - return m_surfaces.childObjects(); + return m_surfaces.children(); } //-------------------------------------------------------------------------------------------------- @@ -277,7 +277,7 @@ std::vector RimSurfaceCollection::surfaces() const //-------------------------------------------------------------------------------------------------- std::vector RimSurfaceCollection::subCollections() const { - return m_subCollections.childObjects(); + return m_subCollections.children(); } //-------------------------------------------------------------------------------------------------- @@ -392,7 +392,7 @@ void RimSurfaceCollection::orderChanged( const caf::SignalEmitter* emitter ) //-------------------------------------------------------------------------------------------------- void RimSurfaceCollection::removeSurface( RimSurface* surface ) { - m_surfaces.removeChildObject( surface ); + m_surfaces.removeChild( surface ); } //-------------------------------------------------------------------------------------------------- @@ -466,7 +466,7 @@ RimSurface* RimSurfaceCollection::addSurfacesAtIndex( int position, std::vector< } // reset the surface collection and use the new order - m_surfaces.clear(); + m_surfaces.clearWithoutDelete(); for ( auto surf : orderedSurfs ) { m_surfaces.push_back( surf ); diff --git a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp index aca225d2f2..7107800e88 100644 --- a/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp @@ -137,13 +137,13 @@ void RimSurfaceInViewCollection::updateAllViewItems() void RimSurfaceInViewCollection::syncCollectionsWithView() { // check that we have surface in view collections for all sub-collections - std::vector colls = m_collectionsInView.childObjects(); + std::vector colls = m_collectionsInView.children(); for ( auto surfcoll : colls ) { if ( !surfcoll->surfaceCollection() ) { - m_collectionsInView.removeChildObject( surfcoll ); + m_collectionsInView.removeChild( surfcoll ); delete surfcoll; } } @@ -172,7 +172,7 @@ void RimSurfaceInViewCollection::syncCollectionsWithView() } // make sure our view surfaces have the same order as the source surface collection - m_collectionsInView.clear(); + m_collectionsInView.clearWithoutDelete(); for ( auto viewColl : orderedColls ) { m_collectionsInView.push_back( viewColl ); @@ -188,13 +188,13 @@ void RimSurfaceInViewCollection::syncSurfacesWithView() { // Delete surfaceInView without any real Surface connection - std::vector surfsInView = m_surfacesInView.childObjects(); + std::vector surfsInView = m_surfacesInView.children(); for ( auto surf : surfsInView ) { if ( !surf->surface() ) { - m_surfacesInView.removeChildObject( surf ); + m_surfacesInView.removeChild( surf ); delete surf; } } @@ -229,7 +229,7 @@ void RimSurfaceInViewCollection::syncSurfacesWithView() } // make sure our view surfaces have the same order as the source surface collection - m_surfacesInView.clear(); + m_surfacesInView.clearWithoutDelete(); for ( auto viewSurf : orderedSurfs ) { m_surfacesInView.push_back( viewSurf ); diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogs.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogs.cpp index 6601de125f..00651b2bb3 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogs.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogs.cpp @@ -43,7 +43,7 @@ RimEnsembleWellLogs::RimEnsembleWellLogs() //-------------------------------------------------------------------------------------------------- void RimEnsembleWellLogs::removeWellLogFile( RimWellLogFile* summaryCase ) { - m_wellLogFiles.removeChildObject( summaryCase ); + m_wellLogFiles.removeChild( summaryCase ); } //-------------------------------------------------------------------------------------------------- @@ -59,7 +59,7 @@ void RimEnsembleWellLogs::addWellLogFile( RimWellLogFile* summaryCase ) //-------------------------------------------------------------------------------------------------- std::vector RimEnsembleWellLogs::wellLogFiles() const { - return m_wellLogFiles().childObjects(); + return m_wellLogFiles().children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.cpp index 8f3c319a91..88eebd918a 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogsCollection.cpp @@ -40,7 +40,7 @@ RimEnsembleWellLogsCollection::RimEnsembleWellLogsCollection() //-------------------------------------------------------------------------------------------------- RimEnsembleWellLogsCollection::~RimEnsembleWellLogsCollection() { - m_ensembleWellLogs.deleteAllChildObjects(); + m_ensembleWellLogs.deleteChildren(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp index 590e82af9b..cea36412cd 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFile.cpp @@ -101,7 +101,7 @@ RimWellLogFile::RimWellLogFile() //-------------------------------------------------------------------------------------------------- RimWellLogFile::~RimWellLogFile() { - m_wellLogChannelNames.deleteAllChildObjects(); + m_wellLogChannelNames.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -172,7 +172,7 @@ bool RimWellLogFile::readFile( QString* errorMessage ) m_date = DEFAULT_DATE_TIME; } - m_wellLogChannelNames.deleteAllChildObjects(); + m_wellLogChannelNames.deleteChildren(); QStringList wellLogNames = m_wellLogDataFile->wellLogChannelNames(); for ( int logIdx = 0; logIdx < wellLogNames.size(); logIdx++ ) diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotCollection.cpp index 7d1390642a..15ad522aaf 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogPlotCollection.cpp @@ -147,7 +147,7 @@ RigGeoMechWellLogExtractor* RimWellLogPlotCollection::findOrCreateExtractor( Rim //-------------------------------------------------------------------------------------------------- std::vector RimWellLogPlotCollection::wellLogPlots() const { - return m_wellLogPlots.childObjects(); + return m_wellLogPlots.children(); } //-------------------------------------------------------------------------------------------------- @@ -163,7 +163,7 @@ void RimWellLogPlotCollection::addWellLogPlot( gsl::not_null we //-------------------------------------------------------------------------------------------------- void RimWellLogPlotCollection::deleteAllPlots() { - m_wellLogPlots.deleteAllChildObjects(); + m_wellLogPlots.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -171,7 +171,7 @@ void RimWellLogPlotCollection::deleteAllPlots() //-------------------------------------------------------------------------------------------------- void RimWellLogPlotCollection::removePlot( gsl::not_null plot ) { - m_wellLogPlots.removeChildObject( plot ); + m_wellLogPlots.removeChild( plot ); updateAllRequiredEditors(); } diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp index 38645637ee..c9af9f159c 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogTrack.cpp @@ -286,7 +286,7 @@ RimWellLogTrack::RimWellLogTrack() //-------------------------------------------------------------------------------------------------- RimWellLogTrack::~RimWellLogTrack() { - m_curves.deleteAllChildObjects(); + m_curves.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -1172,7 +1172,7 @@ void RimWellLogTrack::removeCurve( RimWellLogCurve* curve ) if ( index < m_curves.size() ) { m_curves[index]->detach(); - m_curves.removeChildObject( curve ); + m_curves.removeChild( curve ); } } @@ -1181,7 +1181,7 @@ void RimWellLogTrack::removeCurve( RimWellLogCurve* curve ) //-------------------------------------------------------------------------------------------------- void RimWellLogTrack::deleteAllCurves() { - m_curves.deleteAllChildObjects(); + m_curves.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -2282,7 +2282,7 @@ std::map> RimWellLogTrack::visibleStackedCurv //-------------------------------------------------------------------------------------------------- std::vector RimWellLogTrack::curves() const { - return m_curves.childObjects(); + return m_curves.children(); } //-------------------------------------------------------------------------------------------------- @@ -2292,7 +2292,7 @@ std::vector RimWellLogTrack::visibleCurves() const { std::vector curvesVector; - for ( RimWellLogCurve* curve : m_curves.childObjects() ) + for ( RimWellLogCurve* curve : m_curves.children() ) { if ( curve->isCurveVisible() ) { diff --git a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCollection.cpp index 92a0a2e96e..01c1c411b8 100644 --- a/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellMeasurement/RimWellMeasurementCollection.cpp @@ -154,7 +154,7 @@ void RimWellMeasurementCollection::appendMeasurement( RimWellMeasurement* measur //-------------------------------------------------------------------------------------------------- void RimWellMeasurementCollection::deleteMeasurement( RimWellMeasurement* measurementToDelete ) { - m_measurements.removeChildObject( measurementToDelete ); + m_measurements.removeChild( measurementToDelete ); delete measurementToDelete; this->updateAllCurves(); @@ -165,7 +165,7 @@ void RimWellMeasurementCollection::deleteMeasurement( RimWellMeasurement* measur //-------------------------------------------------------------------------------------------------- void RimWellMeasurementCollection::deleteAllMeasurements() { - m_measurements.deleteAllChildObjects(); + m_measurements.deleteChildren(); this->updateAllCurves(); } @@ -243,7 +243,7 @@ void RimWellMeasurementCollection::addFilePath( const QString& filePath ) //-------------------------------------------------------------------------------------------------- void RimWellMeasurementCollection::removeFilePath( RimWellMeasurementFilePath* measurementFilePath ) { - m_importedFiles.removeChildObject( measurementFilePath ); + m_importedFiles.removeChild( measurementFilePath ); delete measurementFilePath; } @@ -265,7 +265,7 @@ void RimWellMeasurementCollection::removeMeasurementsForFilePath( RimWellMeasure // Remove then remove them without invalidating the iterator for ( unsigned int i = 0; i < measurementsToRemove.size(); i++ ) { - m_measurements.removeChildObject( measurementsToRemove[i] ); + m_measurements.removeChild( measurementsToRemove[i] ); delete measurementsToRemove[i]; } diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp index 694983c012..a7a26e6f50 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp @@ -116,7 +116,7 @@ bool RimWellIASettings::initSettings( QString& outErrmsg ) RifParameterXmlReader basicreader( RiaPreferencesGeoMech::current()->geomechWIADefaultXML() ); if ( !basicreader.parseFile( outErrmsg ) ) return false; - m_parameters.clear(); + m_parameters.clearWithoutDelete(); for ( auto group : basicreader.parameterGroups() ) { m_parameters.push_back( group ); @@ -525,7 +525,7 @@ void RimWellIASettings::addCsvGroup( QString name, QStringList timeSteps, double //-------------------------------------------------------------------------------------------------- void RimWellIASettings::initCsvParameters() { - m_csvParameters.clear(); + m_csvParameters.clearWithoutDelete(); QStringList timeSteps = m_geomechCase->timeStepStrings(); diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettingsCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettingsCollection.cpp index 1006a5b33d..c0c77bcace 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettingsCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettingsCollection.cpp @@ -89,7 +89,7 @@ RimWellIASettings* RimWellIASettingsCollection::startWellIntegrationAnalysis( QS //-------------------------------------------------------------------------------------------------- std::vector RimWellIASettingsCollection::settings() const { - return m_wellIASettings.childObjects(); + return m_wellIASettings.children(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp index 43675e0d5e..764bed1621 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp @@ -930,7 +930,7 @@ void RimWellPath::detachWellLogFile( RimWellLogFile* logFileInfo ) { if ( m_wellLogFiles[i] == pdmObject ) { - m_wellLogFiles.removeChildObject( pdmObject ); + m_wellLogFiles.removeChild( pdmObject ); break; } } diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp index a7aaf5d7bc..36731c0373 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp @@ -96,7 +96,7 @@ void RimWellPathAttributeCollection::insertAttribute( RimWellPathAttribute* inse //-------------------------------------------------------------------------------------------------- void RimWellPathAttributeCollection::deleteAttribute( RimWellPathAttribute* attributeToDelete ) { - m_attributes.removeChildObject( attributeToDelete ); + m_attributes.removeChild( attributeToDelete ); delete attributeToDelete; this->updateAllReferringTracks(); @@ -107,7 +107,7 @@ void RimWellPathAttributeCollection::deleteAttribute( RimWellPathAttribute* attr //-------------------------------------------------------------------------------------------------- void RimWellPathAttributeCollection::deleteAllAttributes() { - m_attributes.deleteAllChildObjects(); + m_attributes.deleteChildren(); this->updateAllReferringTracks(); } diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp index bf268cab09..e5631a986a 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp @@ -294,7 +294,7 @@ void RimWellPathCollection::addWellPath( gsl::not_null wellPath, b //-------------------------------------------------------------------------------------------------- std::vector RimWellPathCollection::allWellPaths() const { - return m_wellPaths.childObjects(); + return m_wellPaths.children(); } //-------------------------------------------------------------------------------------------------- @@ -572,8 +572,8 @@ RimWellPath* RimWellPathCollection::tryFindMatchingWellPath( const QString& well //-------------------------------------------------------------------------------------------------- void RimWellPathCollection::deleteAllWellPaths() { - m_wellPaths.deleteAllChildObjects(); - m_wellPathNodes.deleteAllChildObjects(); + m_wellPaths.deleteChildren(); + m_wellPathNodes.deleteChildren(); m_wellPathImporter->clear(); updateAllRequiredEditors(); @@ -584,7 +584,7 @@ void RimWellPathCollection::deleteAllWellPaths() //-------------------------------------------------------------------------------------------------- void RimWellPathCollection::deleteWell( RimWellPath* wellPath ) { - m_wellPaths.removeChildObject( wellPath ); + m_wellPaths.removeChild( wellPath ); delete wellPath; } @@ -789,9 +789,9 @@ caf::AppEnum RimWellPathCollection::findUnitSyste //-------------------------------------------------------------------------------------------------- void RimWellPathCollection::rebuildWellPathNodes() { - m_wellPathNodes.deleteAllChildObjects(); + m_wellPathNodes.deleteChildren(); - std::map> rootWells = wellPathsForWellNameStem( m_wellPaths.childObjects() ); + std::map> rootWells = wellPathsForWellNameStem( m_wellPaths.children() ); for ( auto [groupName, wellPathGroup] : rootWells ) { if ( groupName == unGroupedText() ) diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGeometryDef.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGeometryDef.cpp index 00e6442c52..7ff2ab11e4 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGeometryDef.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGeometryDef.cpp @@ -389,7 +389,7 @@ void RimWellPathGeometryDef::insertTarget( const RimWellPathTarget* targetToInse //-------------------------------------------------------------------------------------------------- void RimWellPathGeometryDef::deleteTarget( RimWellPathTarget* targetTodelete ) { - m_wellTargets.removeChildObject( targetTodelete ); + m_wellTargets.removeChild( targetTodelete ); delete targetTodelete; } @@ -398,7 +398,7 @@ void RimWellPathGeometryDef::deleteTarget( RimWellPathTarget* targetTodelete ) //-------------------------------------------------------------------------------------------------- void RimWellPathGeometryDef::deleteAllTargets() { - m_wellTargets.deleteAllChildObjects(); + m_wellTargets.deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -408,7 +408,7 @@ RimWellPathTarget* RimWellPathGeometryDef::appendTarget() { RimWellPathTarget* wellPathTarget = nullptr; - auto targets = m_wellTargets.childObjects(); + auto targets = m_wellTargets.children(); if ( targets.empty() ) { wellPathTarget = new RimWellPathTarget; diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp index febc831b98..3bdc04eab8 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp @@ -99,7 +99,7 @@ void RimWellPathGroup::addChildWellPath( RimWellPath* wellPath ) //-------------------------------------------------------------------------------------------------- std::vector RimWellPathGroup::childWellPaths() const { - return m_childWellPaths.childObjects(); + return m_childWellPaths.children(); } //-------------------------------------------------------------------------------------------------- @@ -123,7 +123,7 @@ bool RimWellPathGroup::hasChildWellPath( RimWellPath* wellPath ) //-------------------------------------------------------------------------------------------------- void RimWellPathGroup::removeChildWellPath( RimWellPath* wellPath ) { - m_childWellPaths.removeChildObject( wellPath ); + m_childWellPaths.removeChild( wellPath ); RimWellPath::copyCompletionSettings( this, wellPath ); if ( auto geometry = wellPath->wellPathGeometry(); geometry ) @@ -145,7 +145,7 @@ void RimWellPathGroup::removeChildWellPath( RimWellPath* wellPath ) //-------------------------------------------------------------------------------------------------- void RimWellPathGroup::removeAllChildWellPaths() { - auto childWellPaths = m_childWellPaths.childObjects(); + auto childWellPaths = m_childWellPaths.children(); for ( auto wellPath : childWellPaths ) { removeChildWellPath( wellPath ); @@ -419,7 +419,7 @@ void RimWellPathGroup::makeMoreLevelsIfNecessary() RimWellPathGroup* newGroup = new RimWellPathGroup; for ( auto wellPath : wellPaths ) { - m_childWellPaths().removeChildObject( wellPath ); + m_childWellPaths().removeChild( wellPath ); newGroup->addChildWellPath( wellPath ); newGroup->wellPathGeometry()->setUniqueStartAndEndIndex( childStartIndex, std::numeric_limits::max() ); diff --git a/ApplicationLibCode/ProjectDataModel/cafTreeNode.cpp b/ApplicationLibCode/ProjectDataModel/cafTreeNode.cpp index 7f70d847e1..cbe7a2cad4 100644 --- a/ApplicationLibCode/ProjectDataModel/cafTreeNode.cpp +++ b/ApplicationLibCode/ProjectDataModel/cafTreeNode.cpp @@ -45,7 +45,7 @@ void cafTreeNode::addChild( cafTreeNode* treeNode ) //-------------------------------------------------------------------------------------------------- std::vector cafTreeNode::childNodes() const { - return m_childNodes.childObjects(); + return m_childNodes.children(); } //-------------------------------------------------------------------------------------------------- @@ -226,7 +226,7 @@ void cafObjectReferenceTreeNode::defineUiTreeOrdering( caf::PdmUiTreeOrdering& u uiTreeOrdering.add( m_referencedObject() ); } - for ( auto c : m_childNodes.childObjects() ) + for ( auto c : m_childNodes.children() ) { if ( auto obj = c->referencedObject() ) { diff --git a/ApplicationLibCode/UnitTests/RimRelocatePath-Test.cpp b/ApplicationLibCode/UnitTests/RimRelocatePath-Test.cpp index 960cf64a3e..f92644935f 100644 --- a/ApplicationLibCode/UnitTests/RimRelocatePath-Test.cpp +++ b/ApplicationLibCode/UnitTests/RimRelocatePath-Test.cpp @@ -39,7 +39,7 @@ void fieldsByType( caf::PdmObjectHandle* object, std::vector& typedFields ) } } - field->childObjects( &children ); + field->children( &children ); } for ( const auto& child : children ) diff --git a/ApplicationLibCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp b/ApplicationLibCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp index c14ee2711e..12105bd166 100644 --- a/ApplicationLibCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp +++ b/ApplicationLibCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp @@ -226,7 +226,7 @@ void RiuAdvancedSnapshotExportWidget::deleteAllSnapshotItems() { if ( !m_rimProject ) return; - m_rimProject->multiSnapshotDefinitions.deleteAllChildObjects(); + m_rimProject->multiSnapshotDefinitions.deleteChildren(); m_rimProject->multiSnapshotDefinitions.uiCapability()->updateConnectedEditors(); } diff --git a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp index 4b23e8d81c..32b2e8686a 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp +++ b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp @@ -1336,7 +1336,7 @@ void RiuSummaryVectorSelectionUi::defineEditorAttribute( const caf::PdmFieldHand //-------------------------------------------------------------------------------------------------- void RiuSummaryVectorSelectionUi::resetAllFields() { - m_selectedSources.clear(); + m_selectedSources.clearWithoutDelete(); m_selectedSummaryCategories = std::vector>(); // clear all state in fields diff --git a/Fwk/AppFwk/cafCommandFeatures/AddAndDelete/cafCmdAddItemExec.cpp b/Fwk/AppFwk/cafCommandFeatures/AddAndDelete/cafCmdAddItemExec.cpp index 3779c34405..83a7831eb0 100644 --- a/Fwk/AppFwk/cafCommandFeatures/AddAndDelete/cafCmdAddItemExec.cpp +++ b/Fwk/AppFwk/cafCommandFeatures/AddAndDelete/cafCmdAddItemExec.cpp @@ -123,7 +123,7 @@ void CmdAddItemExec::undo() if ( listField && m_commandData->m_createdItemIndex >= 0 ) { std::vector children; - listField->childObjects( &children ); + listField->children( &children ); caf::PdmObjectHandle* obj = children[m_commandData->m_createdItemIndex]; diff --git a/Fwk/AppFwk/cafCommandFeatures/AddAndDelete/cafCmdDeleteItemExec.cpp b/Fwk/AppFwk/cafCommandFeatures/AddAndDelete/cafCmdDeleteItemExec.cpp index ae3c873b8c..3ff19477bb 100644 --- a/Fwk/AppFwk/cafCommandFeatures/AddAndDelete/cafCmdDeleteItemExec.cpp +++ b/Fwk/AppFwk/cafCommandFeatures/AddAndDelete/cafCmdDeleteItemExec.cpp @@ -66,7 +66,7 @@ void CmdDeleteItemExec::redo() if ( listField ) { std::vector children; - listField->childObjects( &children ); + listField->children( &children ); PdmObjectHandle* obj = children[m_commandData->m_indexToObject]; caf::SelectionManager::instance()->removeObjectFromAllSelections( obj ); diff --git a/Fwk/AppFwk/cafCommandFeatures/AddAndDelete/cafCmdDeleteItemFeature.cpp b/Fwk/AppFwk/cafCommandFeatures/AddAndDelete/cafCmdDeleteItemFeature.cpp index 166777e4dc..1ec852d5e4 100644 --- a/Fwk/AppFwk/cafCommandFeatures/AddAndDelete/cafCmdDeleteItemFeature.cpp +++ b/Fwk/AppFwk/cafCommandFeatures/AddAndDelete/cafCmdDeleteItemFeature.cpp @@ -79,7 +79,7 @@ CmdExecuteCommand* CmdDeleteItemFeature::createExecuteCommand() int indexAfter = -1; std::vector childObjects; - childArrayFieldHandle->childObjects( &childObjects ); + childArrayFieldHandle->children( &childObjects ); for ( size_t i = 0; i < childObjects.size(); i++ ) { diff --git a/Fwk/AppFwk/cafCommandFeatures/ToggleCommands/cafToggleItemsOnOthersOffFeature.cpp b/Fwk/AppFwk/cafCommandFeatures/ToggleCommands/cafToggleItemsOnOthersOffFeature.cpp index c44e94f9e4..a43373c6c2 100644 --- a/Fwk/AppFwk/cafCommandFeatures/ToggleCommands/cafToggleItemsOnOthersOffFeature.cpp +++ b/Fwk/AppFwk/cafCommandFeatures/ToggleCommands/cafToggleItemsOnOthersOffFeature.cpp @@ -141,7 +141,7 @@ std::vector ToggleItemsOnOthersOffFeature::childObjects( std::vector children; if ( parent ) { - parent->childObjects( &children ); + parent->children( &children ); } return children; } @@ -159,4 +159,4 @@ caf::PdmField* ToggleItemsOnOthersOffFeature::objectToggleField( caf::PdmO return nullptr; } -} // namespace caf \ No newline at end of file +} // namespace caf diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h index 491307c6c8..d096d5f9c5 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h @@ -648,7 +648,7 @@ public: void readFromField( QTextStream& outputStream, bool quoteStrings = true, bool quoteNonBuiltins = false ) const override { - PdmFieldScriptingCapabilityIOHandler>::readFromField( m_field->childObjects(), + PdmFieldScriptingCapabilityIOHandler>::readFromField( m_field->children(), outputStream, quoteStrings, quoteNonBuiltins ); diff --git a/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScriptingBasicTest.cpp b/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScriptingBasicTest.cpp index e044b0f76d..d828bffded 100644 --- a/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScriptingBasicTest.cpp +++ b/Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/cafPdmScriptingBasicTest.cpp @@ -201,7 +201,7 @@ public: "Whatsthis SimpleObjectsField" ); } - ~InheritedDemoObj() { m_simpleObjectsField.deleteAllChildObjects(); } + ~InheritedDemoObj() { m_simpleObjectsField.deleteChildren(); } caf::PdmField> m_texts; caf::PdmField> m_numbers; @@ -222,7 +222,7 @@ public: CAF_PDM_InitFieldNoDefault( &objects, "PdmObjects", "", "", "", "" ) } - ~MyPdmDocument() { objects.deleteAllChildObjects(); } + ~MyPdmDocument() { objects.deleteChildren(); } caf::PdmChildArrayField objects; }; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h index 5096fbb95c..4f6f0b6b9b 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.h @@ -24,7 +24,7 @@ public: PdmChildArrayFieldHandle() {} ~PdmChildArrayFieldHandle() override {} - virtual void deleteAllChildObjects() = 0; + virtual void deleteChildren() = 0; bool hasSameFieldCountForAllObjects(); }; @@ -63,15 +63,15 @@ public: size_t size() const override { return m_pointers.size(); } bool empty() const override { return m_pointers.empty(); } - void clear() override; - void deleteAllChildObjects() override; + void clearWithoutDelete() override; + void deleteChildren() override; void insertAt( int indexAfter, PdmObjectHandle* obj ) override; void insertAt( int indexAfter, std::unique_ptr obj ); PdmObjectHandle* at( size_t index ) override; void setValue( const std::vector& objects ); size_t indexOf( const PdmObjectHandle* obj ) const override; - virtual void deleteAllChildObjectsAsync(); + virtual void deleteChildrenAsync(); // std::vector-like access @@ -95,10 +95,10 @@ public: typename std::vector>::const_iterator end() const { return m_pointers.end(); }; // Child objects - std::vector childObjects() const; + std::vector children() const; - void childObjects( std::vector* objects ) override; - void removeChildObject( PdmObjectHandle* object ) override; + void children( std::vector* objects ) override; + void removeChild( PdmObjectHandle* object ) override; private: // To be disabled PDM_DISABLE_COPY_AND_ASSIGN( PdmChildArrayField ); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.inl b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.inl index 809ec65a20..a915c10cdd 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.inl +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayField.inl @@ -14,7 +14,7 @@ namespace caf template PdmChildArrayField::~PdmChildArrayField() { - deleteAllChildObjects(); + deleteChildren(); } //-------------------------------------------------------------------------------------------------- @@ -159,7 +159,7 @@ size_t PdmChildArrayField::indexOf( const PdmObjectHandle* obj ) cons /// Empty the container without deleting the objects pointed to. //-------------------------------------------------------------------------------------------------- template -void PdmChildArrayField::clear() +void PdmChildArrayField::clearWithoutDelete() { CAF_ASSERT( isInitializedByInitFieldMacro() ); @@ -171,7 +171,7 @@ void PdmChildArrayField::clear() /// Deletes all the objects pointed to by the field, then clears the container. //-------------------------------------------------------------------------------------------------- template -void PdmChildArrayField::deleteAllChildObjects() +void PdmChildArrayField::deleteChildren() { CAF_ASSERT( isInitializedByInitFieldMacro() ); @@ -189,7 +189,7 @@ void PdmChildArrayField::deleteAllChildObjects() /// Then clears the container and lets the thread delete the objects. //-------------------------------------------------------------------------------------------------- template -void PdmChildArrayField::deleteAllChildObjectsAsync() +void PdmChildArrayField::deleteChildrenAsync() { CAF_ASSERT( isInitializedByInitFieldMacro() ); @@ -219,7 +219,7 @@ void PdmChildArrayField::erase( size_t index ) template void PdmChildArrayField::setValue( const std::vector& objects ) { - clear(); + clearWithoutDelete(); for ( auto object : objects ) { push_back( object ); @@ -230,7 +230,7 @@ void PdmChildArrayField::setValue( const std::vector& obje /// Removes all instances of object pointer from the container without deleting the object. //-------------------------------------------------------------------------------------------------- template -void PdmChildArrayField::removeChildObject( PdmObjectHandle* object ) +void PdmChildArrayField::removeChild( PdmObjectHandle* object ) { CAF_ASSERT( isInitializedByInitFieldMacro() ); @@ -259,7 +259,7 @@ void PdmChildArrayField::removeChildObject( PdmObjectHandle* object ) /// //-------------------------------------------------------------------------------------------------- template -std::vector caf::PdmChildArrayField::childObjects() const +std::vector caf::PdmChildArrayField::children() const { std::vector objects; @@ -278,7 +278,7 @@ std::vector caf::PdmChildArrayField::childObjects() const /// //-------------------------------------------------------------------------------------------------- template -void PdmChildArrayField::childObjects( std::vector* objects ) +void PdmChildArrayField::children( std::vector* objects ) { if ( !objects ) return; size_t i; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayFieldHandle.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayFieldHandle.cpp index 394be37f4d..88d55d3471 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayFieldHandle.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildArrayFieldHandle.cpp @@ -11,7 +11,7 @@ namespace caf bool PdmChildArrayFieldHandle::hasSameFieldCountForAllObjects() { std::vector listObjects; - this->childObjects( &listObjects ); + this->children( &listObjects ); if ( listObjects.size() == 0 ) { diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h index 622af931fa..9c664db0d9 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.h @@ -21,8 +21,8 @@ class PdmFieldXmlCap; class PdmChildFieldHandle : public PdmFieldHandle { public: - virtual void childObjects( std::vector* objects ) = 0; - virtual void setChildObject( PdmObjectHandle* object ) = 0; + virtual void children( std::vector* objects ) = 0; + virtual void setChildObject( PdmObjectHandle* object ) = 0; }; template @@ -67,9 +67,9 @@ public: const PdmPointer& v() const { return m_fieldValue; } // Child objects - virtual void childObjects( std::vector* objects ) override; + virtual void children( std::vector* objects ) override; void setChildObject( PdmObjectHandle* object ) override; - virtual void removeChildObject( PdmObjectHandle* object ) override; + virtual void removeChild( PdmObjectHandle* object ) override; private: PDM_DISABLE_COPY_AND_ASSIGN( PdmChildField ); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.inl b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.inl index bfcd1f24a0..99ab353fee 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.inl +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmChildField.inl @@ -9,7 +9,7 @@ namespace caf /// //-------------------------------------------------------------------------------------------------- template -void caf::PdmChildField::childObjects( std::vector* objects ) +void caf::PdmChildField::children( std::vector* objects ) { CAF_ASSERT( objects ); PdmObjectHandle* obj = m_fieldValue.rawPtr(); @@ -28,7 +28,7 @@ void caf::PdmChildField::setChildObject( PdmObjectHandle* object ) if ( m_fieldValue.rawPtr() != nullptr ) { PdmObjectHandle* oldObject = m_fieldValue.rawPtr(); - this->removeChildObject( oldObject ); + this->removeChild( oldObject ); delete oldObject; } m_fieldValue.setRawPtr( object ); @@ -39,7 +39,7 @@ void caf::PdmChildField::setChildObject( PdmObjectHandle* object ) /// //-------------------------------------------------------------------------------------------------- template -void caf::PdmChildField::removeChildObject( PdmObjectHandle* object ) +void caf::PdmChildField::removeChild( PdmObjectHandle* object ) { if ( m_fieldValue.rawPtr() != nullptr && m_fieldValue.rawPtr() == object ) { diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Parent.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Parent.cpp index dd2066be8c..74b5371a54 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Parent.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Parent.cpp @@ -10,7 +10,7 @@ Parent::Parent() Parent::~Parent() { delete m_simpleObjectF(); - m_simpleObjectsField.deleteAllChildObjects(); + 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 5bccf96c11..f44a40f599 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmChildArrayFieldHandleTest.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmChildArrayFieldHandleTest.cpp @@ -68,8 +68,8 @@ public: ~ContainerObj() { - derivedObjs.deleteAllChildObjects(); - derivedOtherObjs.deleteAllChildObjects(); + derivedObjs.deleteChildren(); + derivedOtherObjs.deleteChildren(); } caf::PdmChildArrayField derivedObjs; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmCoreBasicTest.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmCoreBasicTest.cpp index d9a3f814d9..85cb5a98da 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmCoreBasicTest.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmCoreBasicTest.cpp @@ -292,10 +292,10 @@ TEST( BaseTest, PdmChildArrayField ) // childObjects std::vector objects; - ihd1->m_childArrayField.childObjects( &objects ); + ihd1->m_childArrayField.children( &objects ); EXPECT_EQ( size_t( 3 ), objects.size() ); - std::vector typedObjects = ihd1->m_childArrayField.childObjects(); + std::vector typedObjects = ihd1->m_childArrayField.children(); EXPECT_EQ( size_t( 3 ), typedObjects.size() ); // set() @@ -303,7 +303,7 @@ TEST( BaseTest, PdmChildArrayField ) EXPECT_TRUE( NULL == ihd1->m_childArrayField[1] ); EXPECT_TRUE( s2->parentField() == NULL ); - ihd1->m_childArrayField.removeChildObject( NULL ); + ihd1->m_childArrayField.removeChild( NULL ); EXPECT_EQ( size_t( 2 ), ihd1->m_childArrayField.size() ); EXPECT_EQ( s3, ihd1->m_childArrayField[1] ); EXPECT_EQ( s1, ihd1->m_childArrayField[0] ); @@ -325,7 +325,7 @@ TEST( BaseTest, PdmChildArrayField ) EXPECT_TRUE( s2->parentField() == NULL ); // clear() - ihd1->m_childArrayField.clear(); + ihd1->m_childArrayField.clearWithoutDelete(); EXPECT_EQ( size_t( 0 ), ihd1->m_childArrayField.size() ); EXPECT_TRUE( s1->parentField() == NULL ); @@ -334,7 +334,7 @@ TEST( BaseTest, PdmChildArrayField ) ihd1->m_childArrayField.push_back( s2 ); ihd1->m_childArrayField.push_back( s3 ); - ihd1->m_childArrayField.deleteAllChildObjects(); + ihd1->m_childArrayField.deleteChildren(); EXPECT_EQ( size_t( 0 ), ihd1->m_childArrayField.size() ); EXPECT_TRUE( s1 == NULL ); EXPECT_TRUE( s2 == NULL ); @@ -382,7 +382,7 @@ TEST( BaseTest, PdmChildArrayFieldHandle ) // virtual void clear() = 0; // virtual PdmObject* createAppendObject(int indexAfter) = 0; // virtual void erase(size_t index) = 0; - // virtual void deleteAllChildObjects() = 0; + // virtual void deleteChildren() = 0; // // virtual PdmObject* at(size_t index) = 0; // @@ -424,7 +424,7 @@ TEST( BaseTest, PdmChildArrayFieldHandle ) EXPECT_TRUE( listField->hasSameFieldCountForAllObjects() ); EXPECT_FALSE( listField->empty() ); - listField->deleteAllChildObjects(); + listField->deleteChildren(); EXPECT_EQ( 0u, listField->size() ); EXPECT_TRUE( listField->hasSameFieldCountForAllObjects() ); EXPECT_TRUE( listField->empty() ); @@ -474,7 +474,7 @@ TEST( BaseTest, PdmChildField ) EXPECT_TRUE( c2 == a.field2 ); std::vector objects; - a.field2.childObjects( &objects ); + a.field2.children( &objects ); EXPECT_EQ( (size_t)1, objects.size() ); EXPECT_EQ( c2, objects[0] ); } diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmReferenceHelperTest.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmReferenceHelperTest.cpp index e79b59dc1c..ee1e11af6a 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmReferenceHelperTest.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmReferenceHelperTest.cpp @@ -56,7 +56,7 @@ public: ~ReferenceSimpleObj() { delete m_pointersField(); - m_simpleObjPtrField.deleteAllChildObjects(); + m_simpleObjPtrField.deleteChildren(); } // Fields @@ -203,10 +203,10 @@ TEST( PdmReferenceHelperTest, ObjectFromReference ) QString refString = caf::PdmReferenceHelper::referenceFromRootToObject( ihd1, s2 ); EXPECT_EQ( s2, caf::PdmReferenceHelper::objectFromReference( ihd1, refString ) ); - ihd1->m_simpleObjPtrField.removeChildObject( s2 ); + ihd1->m_simpleObjPtrField.removeChild( s2 ); EXPECT_EQ( NULL, caf::PdmReferenceHelper::objectFromReference( ihd1, refString ) ); - ihd1->m_simpleObjPtrField.deleteAllChildObjects(); + ihd1->m_simpleObjPtrField.deleteChildren(); EXPECT_EQ( NULL, caf::PdmReferenceHelper::objectFromReference( ihd1, refString ) ); @@ -241,10 +241,10 @@ TEST( PdmReferenceHelperTest, FieldFromReference ) QString refString = caf::PdmReferenceHelper::referenceFromRootToField( ihd1, fHandle ); EXPECT_EQ( fHandle, caf::PdmReferenceHelper::fieldFromReference( ihd1, refString ) ); - ihd1->m_simpleObjPtrField.removeChildObject( s2 ); + ihd1->m_simpleObjPtrField.removeChild( s2 ); EXPECT_EQ( NULL, caf::PdmReferenceHelper::fieldFromReference( ihd1, refString ) ); - ihd1->m_simpleObjPtrField.deleteAllChildObjects(); + ihd1->m_simpleObjPtrField.deleteChildren(); EXPECT_EQ( NULL, caf::PdmReferenceHelper::fieldFromReference( ihd1, refString ) ); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.cpp index 335b1af045..f7fcc74622 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.cpp @@ -37,10 +37,10 @@ void PdmFieldHandle::setKeyword( const QString& keyword ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool PdmFieldHandle::hasChildObjects() +bool PdmFieldHandle::hasChildren() { std::vector children; - this->childObjects( &children ); + this->children( &children ); return ( children.size() > 0 ); } diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.h index 026919f6fe..d481f4a869 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmFieldHandle.h @@ -31,9 +31,9 @@ public: std::vector keywordAliases() const; // Child objects - bool hasChildObjects(); - virtual void childObjects( std::vector* ) {} - virtual void removeChildObject( PdmObjectHandle* ) {} + bool hasChildren(); + virtual void children( std::vector* ) {} + virtual void removeChild( PdmObjectHandle* ) {} void setOwnerClass( const QString& ownerClass ); // Ptr referenced objects diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h index ca91c5ffb9..2d4608d3a0 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h @@ -267,7 +267,7 @@ void PdmObjectHandle::descendantsOfType( std::vector& descendants ) const for ( auto f : m_fields ) { std::vector childObjects; - f->childObjects( &childObjects ); + f->children( &childObjects ); for ( auto childObject : childObjects ) { diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.h index 5a49affe77..c1e1b734d8 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.h @@ -52,7 +52,7 @@ public: size_t size() const override { return m_pointers.size(); } bool empty() const override { return m_pointers.empty(); } - void clear() override; + void clearWithoutDelete() override; void insertAt( int indexAfter, PdmObjectHandle* obj ) override; PdmObjectHandle* at( size_t index ) override; size_t indexOf( const PdmObjectHandle* obj ) const override; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.inl b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.inl index c39224f50f..7430d5b175 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.inl +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayField.inl @@ -24,7 +24,7 @@ PdmPtrArrayField::~PdmPtrArrayField() template void PdmPtrArrayField::setValue( const std::vector>& fieldValue ) { - this->clear(); + this->clearWithoutDelete(); this->insert( 0, fieldValue ); } @@ -43,7 +43,7 @@ const std::vector>& PdmPtrArrayField::value() co template void PdmPtrArrayField::setValue( const std::vector& fieldValue ) { - this->clear(); + this->clearWithoutDelete(); for ( DataType* rawPtr : fieldValue ) { this->push_back( PdmPointer( rawPtr ) ); @@ -161,7 +161,7 @@ size_t PdmPtrArrayField::indexOf( const PdmObjectHandle* obj ) const /// Empty the container without deleting the objects pointed to. //-------------------------------------------------------------------------------------------------- template -void PdmPtrArrayField::clear() +void PdmPtrArrayField::clearWithoutDelete() { CAF_ASSERT( isInitializedByInitFieldMacro() ); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayFieldHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayFieldHandle.h index 43d806be20..0d60034053 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayFieldHandle.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmPtrArrayFieldHandle.h @@ -17,7 +17,7 @@ public: virtual size_t size() const = 0; virtual bool empty() const = 0; - virtual void clear() = 0; + virtual void clearWithoutDelete() = 0; virtual void insertAt( int indexAfter, PdmObjectHandle* obj ) = 0; virtual void erase( size_t index ) = 0; virtual size_t indexOf( const PdmObjectHandle* obj ) const = 0; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmReferenceHelper.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmReferenceHelper.cpp index be263c27f7..bb9eb7b9b7 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmReferenceHelper.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmReferenceHelper.cpp @@ -141,7 +141,7 @@ QStringList PdmReferenceHelper::referenceFromRootToObjectAsStringList( PdmObject } std::vector childObjects; - parentField->childObjects( &childObjects ); + parentField->children( &childObjects ); if ( childObjects.size() > 0 ) { @@ -220,7 +220,7 @@ PdmObjectHandle* PdmReferenceHelper::objectFromReferenceStringList( PdmObjectHan } std::vector childObjects; - fieldHandle->childObjects( &childObjects ); + fieldHandle->children( &childObjects ); if ( childObjects.size() == 0 ) { diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.cpp index 72a4b557c8..376d95bd3a 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.cpp @@ -137,7 +137,7 @@ void PdmDocument::updateUiIconStateRecursively( PdmObjectHandle* object ) size_t fIdx; for ( fIdx = 0; fIdx < fields.size(); ++fIdx ) { - if ( fields[fIdx] ) fields[fIdx]->childObjects( &children ); + if ( fields[fIdx] ) fields[fIdx]->children( &children ); } size_t cIdx; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.cpp index 2339b98d9e..3b8cc2afc0 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmObject.cpp @@ -72,7 +72,7 @@ void PdmObject::descendantsIncludingThisFromClassKeyword( const QString& for ( auto f : fields ) { std::vector childObjects; - f->childObjects( &childObjects ); + f->children( &childObjects ); for ( auto childObject : childObjects ) { PdmObject* pdmObjectChild = dynamic_cast( childObject ); @@ -94,7 +94,7 @@ void PdmObject::childrenFromClassKeyword( const QString& classKeyword, std::vect for ( auto f : fields ) { std::vector childObjects; - f->childObjects( &childObjects ); + f->children( &childObjects ); for ( auto childObject : childObjects ) { PdmObject* pdmObjectChild = dynamic_cast( childObject ); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiCommandSystemProxy.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiCommandSystemProxy.cpp index eb692471c4..69c1a2a289 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiCommandSystemProxy.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiCommandSystemProxy.cpp @@ -198,7 +198,7 @@ std::vector PdmUiCommandSystemProxy::fieldsFromSelection( PdmFi for ( auto field : childFields ) { std::vector childObjects; - field->childObjects( &childObjects ); + field->children( &childObjects ); for ( auto childObj : childObjects ) { auto childFieldHandle = childObj->findField( fieldKeyword ); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp index b420bd1b66..3ab7a5201a 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp @@ -118,13 +118,13 @@ void PdmUiObjectHandle::addDefaultUiTreeChildren( PdmUiTreeOrdering* uiTreeOrder for ( size_t fIdx = 0; fIdx < fields.size(); ++fIdx ) { - if ( fields[fIdx]->hasChildObjects() && !uiTreeOrdering->containsField( fields[fIdx] ) ) + if ( fields[fIdx]->hasChildren() && !uiTreeOrdering->containsField( fields[fIdx] ) ) { if ( fields[fIdx]->uiCapability()->isUiTreeHidden() && !fields[fIdx]->uiCapability()->isUiTreeChildrenHidden() ) { std::vector children; - fields[fIdx]->childObjects( &children ); + fields[fIdx]->children( &children ); std::set objectsAddedByApplication; for ( int i = 0; i < uiTreeOrdering->childCount(); i++ ) @@ -193,7 +193,7 @@ void PdmUiObjectHandle::expandUiTree( PdmUiTreeOrdering* root, const QString& ui !root->field()->uiCapability()->isUiTreeChildrenHidden( uiConfigName ) ) { std::vector fieldsChildObjects; - root->field()->childObjects( &fieldsChildObjects ); + root->field()->children( &fieldsChildObjects ); for ( size_t cIdx = 0; cIdx < fieldsChildObjects.size(); ++cIdx ) { PdmObjectHandle* childObject = fieldsChildObjects[cIdx]; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp index bb9ab1ec3b..90acb343ba 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp @@ -59,7 +59,7 @@ void PdmUiTreeOrdering::add( PdmFieldHandle* field, QString uiConfigName ) if ( !field->uiCapability()->isUiTreeChildrenHidden( uiConfigName ) ) { std::vector children; - field->childObjects( &children ); + field->children( &children ); for ( PdmObjectHandle* objHandle : children ) { diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl index a79b8853b2..9719add212 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafInternalPdmXmlFieldCapability.inl @@ -163,7 +163,7 @@ void caf::PdmFieldXmlCap>::readFieldData( QXmlS m_isResolved = false; m_referenceString = dataString; - m_field->clear(); + m_field->clearWithoutDelete(); } //-------------------------------------------------------------------------------------------------- @@ -193,7 +193,7 @@ bool caf::PdmFieldXmlCap>::resolveReferences() { if ( m_isResolved ) return true; if ( m_referenceString.isEmpty() ) return true; - m_field->clear(); + m_field->clearWithoutDelete(); bool foundValidObjectFromString = true; QStringList tokens = m_referenceString.split( '|' ); @@ -373,7 +373,7 @@ template void caf::PdmFieldXmlCap>::readFieldData( QXmlStreamReader& xmlStream, PdmObjectFactory* objectFactory ) { - m_field->deleteAllChildObjects(); + m_field->deleteChildren(); PdmFieldIOHelper::skipCharactersAndComments( xmlStream ); while ( xmlStream.isStartElement() ) { diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.cpp index 4ccde3f392..ddebafab34 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmSettings.cpp @@ -61,7 +61,7 @@ void PdmSettings::readFieldsFromApplicationStore( caf::PdmObjectHandle* object, caf::PdmFieldHandle* fieldHandle = fields[i]; std::vector children; - fieldHandle->childObjects( &children ); + fieldHandle->children( &children ); for ( size_t childIdx = 0; childIdx < children.size(); childIdx++ ) { caf::PdmObjectHandle* child = children[childIdx]; @@ -109,7 +109,7 @@ void PdmSettings::writeFieldsToApplicationStore( const caf::PdmObjectHandle* obj caf::PdmFieldHandle* fieldHandle = fields[i]; std::vector children; - fieldHandle->childObjects( &children ); + fieldHandle->children( &children ); for ( size_t childIdx = 0; childIdx < children.size(); childIdx++ ) { caf::PdmObjectHandle* child = children[childIdx]; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp index bb53a79cc5..4284025b72 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp @@ -325,7 +325,7 @@ void PdmXmlObjectHandle::initAfterReadRecursively( PdmObjectHandle* object ) size_t fIdx; for ( fIdx = 0; fIdx < fields.size(); ++fIdx ) { - if ( fields[fIdx] ) fields[fIdx]->childObjects( &children ); + if ( fields[fIdx] ) fields[fIdx]->children( &children ); } size_t cIdx; @@ -359,7 +359,7 @@ void PdmXmlObjectHandle::resolveReferencesRecursively( PdmObjectHandle* PdmFieldHandle* field = fields[fIdx]; if ( field ) { - field->childObjects( &children ); + field->children( &children ); bool resolvedOk = field->xmlCapability()->resolveReferences(); if ( fieldWithFailingResolve && !resolvedOk ) @@ -408,7 +408,7 @@ void PdmXmlObjectHandle::setupBeforeSaveRecursively( PdmObjectHandle* object ) size_t fIdx; for ( fIdx = 0; fIdx < fields.size(); ++fIdx ) { - if ( fields[fIdx] ) fields[fIdx]->childObjects( &children ); + if ( fields[fIdx] ) fields[fIdx]->children( &children ); } size_t cIdx; diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXmlBasicTest.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXmlBasicTest.cpp index 97734d3c42..fc37b8922b 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXmlBasicTest.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXmlBasicTest.cpp @@ -189,7 +189,7 @@ public: CAF_PDM_XML_InitField( &m_childArrayField, "DemoPdmObjectects" ); } - ~InheritedDemoObj() { m_childArrayField.deleteAllChildObjects(); } + ~InheritedDemoObj() { m_childArrayField.deleteChildren(); } caf::PdmDataValueField m_texts; caf::PdmChildArrayField m_childArrayField; @@ -257,7 +257,7 @@ public: ~ReferenceDemoPdmObject() { delete m_pointersField(); - m_simpleObjPtrField2.deleteAllChildObjects(); + m_simpleObjPtrField2.deleteChildren(); } // Fields diff --git a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafPdmBasicTest.cpp b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafPdmBasicTest.cpp index 63dfae0aee..f09a293922 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafPdmBasicTest.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/cafPdmBasicTest.cpp @@ -193,7 +193,7 @@ public: "Whatsthis SimpleObjectsField" ); } - ~InheritedDemoObj() { m_simpleObjectsField.deleteAllChildObjects(); } + ~InheritedDemoObj() { m_simpleObjectsField.deleteChildren(); } caf::PdmField> m_texts; caf::PdmField> m_testEnumField; @@ -212,7 +212,7 @@ public: CAF_PDM_InitFieldNoDefault( &objects, "PdmObjects", "", "", "", "" ) } - ~MyPdmDocument() { objects.deleteAllChildObjects(); } + ~MyPdmDocument() { objects.deleteChildren(); } caf::PdmChildArrayField objects; }; @@ -550,7 +550,7 @@ TEST( BaseTest, ReadWrite ) } d2->m_simpleObjPtrField = NULL; - xmlDoc.objects.deleteAllChildObjects(); + xmlDoc.objects.deleteChildren(); } { @@ -866,7 +866,7 @@ TEST( BaseTest, PdmChildArrayFieldHandle ) // virtual void clear() = 0; // virtual PdmObject* createAppendObject(int indexAfter) = 0; // virtual void erase(size_t index) = 0; - // virtual void deleteAllChildObjects() = 0; + // virtual void deleteChildren() = 0; // // virtual PdmObject* at(size_t index) = 0; // @@ -907,7 +907,7 @@ TEST( BaseTest, PdmChildArrayFieldHandle ) EXPECT_TRUE( listField->hasSameFieldCountForAllObjects() ); EXPECT_FALSE( listField->empty() ); - listField->deleteAllChildObjects(); + listField->deleteChildren(); EXPECT_EQ( 0u, listField->size() ); EXPECT_TRUE( listField->hasSameFieldCountForAllObjects() ); EXPECT_TRUE( listField->empty() ); diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp index 865ed7bf59..c9205c7f73 100644 --- a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp +++ b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp @@ -759,7 +759,7 @@ public: std::vector objects; field = this->parentField(); - field->childObjects(&objects); + field->children(&objects); for (size_t i = 0; i < objects.size(); ++i) { @@ -1308,7 +1308,7 @@ void MainWindow::releaseTestData() { if (m_testRoot) { - m_testRoot->objects.deleteAllChildObjects(); + m_testRoot->objects.deleteChildren(); delete m_testRoot; } } @@ -1407,7 +1407,7 @@ void MainWindow::slotRemove() // Ordering is important - field->removeChildObject(obj); + field->removeChild(obj); // Delete object delete obj; diff --git a/Fwk/AppFwk/cafTests/cafTestCvfApplication/MainWindow.cpp b/Fwk/AppFwk/cafTests/cafTestCvfApplication/MainWindow.cpp index 5834254d13..2cde2fa261 100644 --- a/Fwk/AppFwk/cafTests/cafTestCvfApplication/MainWindow.cpp +++ b/Fwk/AppFwk/cafTests/cafTestCvfApplication/MainWindow.cpp @@ -282,7 +282,7 @@ void MainWindow::slotRemove() // Ordering is important - field->removeChildObject(obj); + field->removeChild(obj); // Delete object delete obj; diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewQModel.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewQModel.cpp index d5686dc473..a1d77c0029 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewQModel.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewQModel.cpp @@ -341,7 +341,7 @@ void PdmUiTreeViewQModel::updateSubTreeRecursive( const QModelIndex& existingSub it != indicesToRemoveFromSource.rend(); ++it ) { - // Use the removeChildrenNoDelete() to remove the pointer from the list without deleting the pointer + // Use the removeChildNoDelete() to remove the pointer from the list without deleting the pointer sourceSubTreeRoot->removeChildrenNoDelete( *it, 1 ); } diff --git a/GrpcInterface/RiaGrpcCommandService.cpp b/GrpcInterface/RiaGrpcCommandService.cpp index a8073357cf..3ee39f216a 100644 --- a/GrpcInterface/RiaGrpcCommandService.cpp +++ b/GrpcInterface/RiaGrpcCommandService.cpp @@ -259,7 +259,7 @@ void RiaGrpcCommandService::assignPdmObjectValues( caf::PdmObjectHandle* if ( pdmChildFieldHandle ) { std::vector childObjects; - pdmChildFieldHandle->childObjects( &childObjects ); + pdmChildFieldHandle->children( &childObjects ); caf::PdmObjectHandle* childObject = nullptr; CAF_ASSERT( childObjects.size() <= 1u ); // We do not support child array fields yet diff --git a/GrpcInterface/RiaGrpcPdmObjectService.cpp b/GrpcInterface/RiaGrpcPdmObjectService.cpp index 2be5c99584..b97d5c5c63 100644 --- a/GrpcInterface/RiaGrpcPdmObjectService.cpp +++ b/GrpcInterface/RiaGrpcPdmObjectService.cpp @@ -416,7 +416,7 @@ grpc::Status RiaGrpcPdmObjectService::GetChildPdmObjects( grpc::ServerContext* if ( scriptability && scriptability->scriptFieldName() == fieldName ) { std::vector childObjects; - field->childObjects( &childObjects ); + field->children( &childObjects ); for ( auto pdmChild : childObjects ) { rips::PdmObject* ripsChild = reply->add_objects();