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

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

View File

@@ -74,7 +74,7 @@ bool RicWellLogTools::wellHasRftData( const QString& wellName )
{
RimEclipseResultCase* resultCase;
std::vector<RimCase*> cases;
RiaApplication::instance()->project()->allCases( cases );
RimProject::current()->allCases( cases );
for ( RimCase* rimCase : cases )
{
@@ -202,7 +202,7 @@ ExtractionCurveType* RicWellLogTools::addExtractionCurve( RimWellLogTrack*
else
{
std::vector<RimCase*> allCases;
RiaApplication::instance()->project()->allCases( allCases );
RimProject::current()->allCases( allCases );
if ( !allCases.empty() ) caseToApply = allCases.front();
}
}
@@ -220,7 +220,7 @@ ExtractionCurveType* RicWellLogTools::addExtractionCurve( RimWellLogTrack*
}
else
{
auto allWellPaths = RiaApplication::instance()->project()->allWellPaths();
auto allWellPaths = RimProject::current()->allWellPaths();
if ( !allWellPaths.empty() )
{
wellPath = allWellPaths.front();
@@ -286,7 +286,7 @@ ExtractionCurveType* RicWellLogTools::addExtractionCurve( RimWellLogTrack*
plotTrack->updateConnectedEditors();
plot->updateConnectedEditors();
RiaApplication::instance()->project()->updateConnectedEditors();
RimProject::current()->updateConnectedEditors();
RiaGuiApplication::instance()->getOrCreateMainPlotWindow();
RiuPlotMainWindowTools::selectAsCurrentItem( curve );
@@ -311,7 +311,7 @@ RimWellLogRftCurve*
RimEclipseResultCase* resultCase = nullptr;
std::vector<RimCase*> cases;
RiaApplication::instance()->project()->allCases( cases );
RimProject::current()->allCases( cases );
for ( RimCase* rimCase : cases )
{
@@ -337,7 +337,7 @@ RimWellLogRftCurve*
plotTrack->setFormationTrajectoryType( RimWellLogTrack::SIMULATION_WELL );
plotTrack->updateConnectedEditors();
RiaApplication::instance()->project()->updateConnectedEditors();
RimProject::current()->updateConnectedEditors();
RiaGuiApplication::instance()->getOrCreateMainPlotWindow();
RiuPlotMainWindowTools::selectAsCurrentItem( curve );
@@ -366,7 +366,7 @@ RimWellLogFileCurve* RicWellLogTools::addFileCurve( RimWellLogTrack* plotTrack,
plotTrack->updateConnectedEditors();
RiaApplication::instance()->project()->updateConnectedEditors();
RimProject::current()->updateConnectedEditors();
RiaGuiApplication::instance()->getOrCreateMainPlotWindow();
RiuPlotMainWindowTools::selectAsCurrentItem( curve );
@@ -439,7 +439,7 @@ RimWellMeasurementCurve* RicWellLogTools::addWellMeasurementCurve( RimWellLogTra
plotTrack->addCurve( curve );
plotTrack->updateConnectedEditors();
RiaApplication::instance()->project()->updateConnectedEditors();
RimProject::current()->updateConnectedEditors();
RiaGuiApplication::instance()->getOrCreateMainPlotWindow();
RiuPlotMainWindowTools::selectAsCurrentItem( curve );