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

Replace RiaApplication::instance()->project() with RimProject::current().

Browse Source 
Also remove uneccessary includes of RiaApplication.h.
This commit is contained in:
Kristian Bendiksen
2020-05-12 09:50:38 +02:00
committed by Magne Sjaastad
parent 7972ff8c02
commit c016c02e40
263 changed files with 320 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/UserInterface/RiuSummaryVectorSelectionUi.cpp
View File

@@ -18,7 +18,6 @@
#include "RiuSummaryVectorSelectionUi.h"
#include "RiaApplication.h"
#include "RiaCurveSetDefinition.h"
#include "RiaStdStringTools.h"
#include "RiaSummaryCurveDefinition.h"
@@ -577,7 +576,7 @@ void RiuSummaryVectorSelectionUi::setFieldChangedHandler( const std::function<vo
//--------------------------------------------------------------------------------------------------
void RiuSummaryVectorSelectionUi::setDefaultSelection( const std::vector<SummarySource*>& defaultSources )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
auto allSumCases = proj->allSummaryCases();
if ( allSumCases.size() > 0 )
@@ -1309,7 +1308,7 @@ std::vector<SummarySource*> RiuSummaryVectorSelectionUi::selectedSummarySources(
//--------------------------------------------------------------------------------------------------
RimSummaryCase* RiuSummaryVectorSelectionUi::calculatedSummaryCase()
{
RimSummaryCalculationCollection* calcColl = RiaApplication::instance()->project()->calculationCollection();
RimSummaryCalculationCollection* calcColl = RimProject::current()->calculationCollection();
return calcColl->calculationSummaryCase();
}
@@ -1319,7 +1318,7 @@ RimSummaryCase* RiuSummaryVectorSelectionUi::calculatedSummaryCase()
//--------------------------------------------------------------------------------------------------
void RiuSummaryVectorSelectionUi::appendOptionItemsForSources( QList<caf::PdmOptionItemInfo>& options ) const
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
std::vector<RimOilField*> oilFields;
proj->allOilFields( oilFields );