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

16
ApplicationLibCode/ProjectDataModel/RimProject.cpp
View File

@@ -565,9 +565,7 @@ void RimProject::assignCaseIdToCase( RimCase* reservoirCase )
{
if ( reservoirCase )
{
std::vector<RimCase*> cases;
this->descendantsIncludingThisOfType( cases );
std::vector<RimCase*> cases = this->descendantsIncludingThisOfType<RimCase>();
for ( RimCase* rimCase : cases )
{
m_nextValidCaseId = std::max( m_nextValidCaseId, rimCase->caseId() + 1 );
@@ -584,8 +582,7 @@ void RimProject::assignIdToCaseGroup( RimIdenticalGridCaseGroup* caseGroup )
{
if ( caseGroup )
{
std::vector<RimIdenticalGridCaseGroup*> identicalCaseGroups;
this->descendantsIncludingThisOfType( identicalCaseGroups );
std::vector<RimIdenticalGridCaseGroup*> identicalCaseGroups = this->descendantsIncludingThisOfType<RimIdenticalGridCaseGroup>();
for ( RimIdenticalGridCaseGroup* existingCaseGroup : identicalCaseGroups )
{
@@ -605,8 +602,7 @@ void RimProject::assignViewIdToView( Rim3dView* view )
{
if ( m_nextValidViewId < 0 )
{
std::vector<Rim3dView*> views;
this->descendantsIncludingThisOfType( views );
std::vector<Rim3dView*> views = this->descendantsIncludingThisOfType<Rim3dView>();
for ( Rim3dView* existingView : views )
{
@@ -627,8 +623,7 @@ void RimProject::assignPlotIdToPlotWindow( RimPlotWindow* plotWindow )
{
if ( m_nextValidPlotId < 0 )
{
std::vector<RimPlotWindow*> plotWindows;
this->descendantsIncludingThisOfType( plotWindows );
std::vector<RimPlotWindow*> plotWindows = this->descendantsIncludingThisOfType<RimPlotWindow>();
for ( RimPlotWindow* existingPlotWindow : plotWindows )
{
@@ -1174,8 +1169,7 @@ std::vector<RimTextAnnotation*> RimProject::textAnnotations() const
allVisibleGridViews( visibleViews );
for ( const auto& view : visibleViews )
{
std::vector<RimAnnotationInViewCollection*> annotationColls;
view->descendantsIncludingThisOfType( annotationColls );
std::vector<RimAnnotationInViewCollection*> annotationColls = view->descendantsIncludingThisOfType<RimAnnotationInViewCollection>();
if ( annotationColls.size() == 1 )
{