Refactor: migrate fourteen more collections to caf::PdmObjectCollection<T>

Migrated to the templated base, preserving each collection's existing XML
field keyword for project-file backward compatibility:

- RimEnsembleFractureStatisticsCollection
- RimEclipseInputPropertyCollection
- RimPlotDataFilterCollection
- RimGeoMechContourMapViewCollection
- RimIntersectionResultsDefinitionCollection
- RimCustomObjectiveFunctionCollection
- RimStimPlanModelTemplateCollection
- RimEnsembleWellLogsCollection
- RimEclipseContourMapViewCollection
- RimSeismicViewCollection
- RimGridInfoCollection
- RimEclipseStatisticsCaseCollection
- RimWellIASettingsCollection
- RimVfpDataCollection

External callers that accessed the old public/named array fields directly
(RimEclipseInputPropertyCollection::inputProperties,
RimEclipseStatisticsCaseCollection::cases) now use addItem/items() from
the base. RimCustomObjectiveFunction.h replaced its include of the
collection header with a forward declaration to break the new include
cycle introduced by the migration.
This commit is contained in:
Kristian Bendiksen committed 2026-05-11 13:42:13 +02:00
1 parent ddd413cb0b
commit 5e880ffc26
37 files changed
+133 -212

No files matched your search

@@ -12,7 +12,7 @@ RimEclipseContourMapViewCollection::RimEclipseContourMapViewCollection()
{
CAF_PDM_InitObject( "Contour Maps", ":/2DMaps16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_contourMapViews, "EclipseViews", "Contour Maps", ":/CrossSection16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_items, "EclipseViews", "Contour Maps", ":/CrossSection16x16.png" );
}
//--------------------------------------------------------------------------------------------------
@@ -27,7 +27,7 @@ RimEclipseContourMapViewCollection::~RimEclipseContourMapViewCollection()
//--------------------------------------------------------------------------------------------------
std::vector<RimEclipseContourMapView*> RimEclipseContourMapViewCollection::views()
{
return m_contourMapViews.childrenByType();
return items();
}
//--------------------------------------------------------------------------------------------------
@@ -35,7 +35,7 @@ std::vector<RimEclipseContourMapView*> RimEclipseContourMapViewCollection::views
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapViewCollection::addView( RimEclipseContourMapView* contourMap )
{
m_contourMapViews.push_back( contourMap );
addItem( contourMap );
}
//--------------------------------------------------------------------------------------------------
@@ -53,7 +53,7 @@ void RimEclipseContourMapViewCollection::onChildDeleted( caf::PdmChildArrayField
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapViewCollection::clearWithoutDelete()
{
m_contourMapViews.clearWithoutDelete();
m_items.clearWithoutDelete();
}
//--------------------------------------------------------------------------------------------------
@@ -61,5 +61,5 @@ void RimEclipseContourMapViewCollection::clearWithoutDelete()
//--------------------------------------------------------------------------------------------------
void RimEclipseContourMapViewCollection::removeChild( RimEclipseContourMapView* contourMap )
{
m_contourMapViews.removeChild( contourMap );
m_items.removeChild( contourMap );
}
@@ -18,13 +18,11 @@
#pragma once
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "RimEclipseContourMapView.h"
class RimEclipseContourMapView;
#include "cafPdmObjectCollection.h"
class RimEclipseContourMapViewCollection : public caf::PdmObject
class RimEclipseContourMapViewCollection : public caf::PdmObjectCollection<RimEclipseContourMapView>
{
CAF_PDM_HEADER_INIT;
@@ -39,7 +37,4 @@ public:
void clearWithoutDelete();
void removeChild( RimEclipseContourMapView* contourMap );
private:
caf::PdmChildArrayField<RimEclipseContourMapView*> m_contourMapViews;
};