OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename several child() and children() functions

Browse Source
This commit is contained in:
Magne Sjaastad
2022-05-31 13:08:07 +02:00
parent c199f960e3
commit c74701b687
179 changed files with 429 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceCollection.cpp
View File

@@ -269,7 +269,7 @@ RimSurface* RimSurfaceCollection::addGridCaseSurface( RimCase* sourceCase, int o
//--------------------------------------------------------------------------------------------------
std::vector<RimSurface*> RimSurfaceCollection::surfaces() const
{
return m_surfaces.childObjects();
return m_surfaces.children();
}
//--------------------------------------------------------------------------------------------------
@@ -277,7 +277,7 @@ std::vector<RimSurface*> RimSurfaceCollection::surfaces() const
//--------------------------------------------------------------------------------------------------
std::vector<RimSurfaceCollection*> 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 );

12
ApplicationLibCode/ProjectDataModel/Surfaces/RimSurfaceInViewCollection.cpp
View File

@@ -137,13 +137,13 @@ void RimSurfaceInViewCollection::updateAllViewItems()
void RimSurfaceInViewCollection::syncCollectionsWithView()
{
// check that we have surface in view collections for all sub-collections
std::vector<RimSurfaceInViewCollection*> colls = m_collectionsInView.childObjects();
std::vector<RimSurfaceInViewCollection*> 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<RimSurfaceInView*> surfsInView = m_surfacesInView.childObjects();
std::vector<RimSurfaceInView*> 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 );