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

12
ApplicationLibCode/ProjectDataModel/RimCustomObjectiveFunction.cpp
View File

@@ -80,7 +80,7 @@ RimCustomObjectiveFunctionWeight* RimCustomObjectiveFunction::addWeight()
//--------------------------------------------------------------------------------------------------
std::vector<RimCustomObjectiveFunctionWeight*> RimCustomObjectiveFunction::weights() const
{
return m_weights.children();
return m_weights.childrenByType();
}
//--------------------------------------------------------------------------------------------------
@@ -325,9 +325,7 @@ void RimCustomObjectiveFunction::defineUiOrdering( QString uiConfigName, caf::Pd
//--------------------------------------------------------------------------------------------------
RimEnsembleCurveSet* RimCustomObjectiveFunction::parentCurveSet() const
{
RimEnsembleCurveSet* curveSet;
firstAncestorOrThisOfType( curveSet );
return curveSet;
return firstAncestorOrThisOfType<RimEnsembleCurveSet>();
}
//--------------------------------------------------------------------------------------------------
@@ -335,9 +333,7 @@ RimEnsembleCurveSet* RimCustomObjectiveFunction::parentCurveSet() const
//--------------------------------------------------------------------------------------------------
RimCustomObjectiveFunctionCollection* RimCustomObjectiveFunction::parentCollection() const
{
RimCustomObjectiveFunctionCollection* collection;
firstAncestorOrThisOfType( collection );
return collection;
return firstAncestorOrThisOfType<RimCustomObjectiveFunctionCollection>();
}
//--------------------------------------------------------------------------------------------------
@@ -345,7 +341,7 @@ RimCustomObjectiveFunctionCollection* RimCustomObjectiveFunction::parentCollecti
//--------------------------------------------------------------------------------------------------
RimObjectiveFunction* RimCustomObjectiveFunction::objectiveFunction( RimObjectiveFunction::FunctionType functionType ) const
{
for ( auto objectiveFunc : m_objectiveFunctions.children() )
for ( auto objectiveFunc : m_objectiveFunctions.childrenByType() )
{
if ( objectiveFunc->functionType() == functionType )
{