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

Change API for PdmObjectHandle and PdmFieldHandle

Browse Source 
* Refactor interface to PdmObjectHandle and PdmFieldHandle
Return objects instead of passing in structures as parameters

* Add nodiscard to several functions
* Remove redundant this->
* Rename to ptrReferencedObjectsByType
This commit is contained in:
Magne Sjaastad
2023-05-12 21:41:34 +02:00
committed by GitHub
parent 37e29a0f68
commit 0c90f67dcc
510 changed files with 1651 additions and 3111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp
View File

@@ -100,7 +100,7 @@ void RimWellPathGroup::addChildWellPath( RimWellPath* wellPath )
//--------------------------------------------------------------------------------------------------
std::vector<RimWellPath*> RimWellPathGroup::childWellPaths() const
{
return m_childWellPaths.children();
return m_childWellPaths.childrenByType();
}
//--------------------------------------------------------------------------------------------------
@@ -146,7 +146,7 @@ void RimWellPathGroup::removeChildWellPath( RimWellPath* wellPath )
//--------------------------------------------------------------------------------------------------
void RimWellPathGroup::removeAllChildWellPaths()
{
auto childWellPaths = m_childWellPaths.children();
auto childWellPaths = m_childWellPaths.childrenByType();
for ( auto wellPath : childWellPaths )
{
removeChildWellPath( wellPath );
@@ -269,8 +269,7 @@ std::vector<const RigWellPath*> RimWellPathGroup::wellPathGeometries() const
QString RimWellPathGroup::createGroupName() const
{
QStringList allNames;
std::vector<RimWellPath*> descendantWellPaths;
this->descendantsOfType( descendantWellPaths );
std::vector<RimWellPath*> descendantWellPaths = descendantsOfType<RimWellPath>();
for ( auto wellPath : descendantWellPaths )
{
if ( wellPath )
@@ -286,8 +285,7 @@ QString RimWellPathGroup::createGroupName() const
// if no imported well path is present, use all modeled well paths
if ( allNames.empty() )
{
std::vector<RimModeledWellPath*> descendantWellPaths;
this->descendantsOfType( descendantWellPaths );
std::vector<RimModeledWellPath*> descendantWellPaths = descendantsOfType<RimModeledWellPath>();
for ( auto wellPath : descendantWellPaths )
{
if ( wellPath )