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

@@ -19,7 +19,6 @@
CAF_CMD_SOURCE_INIT( RicNewEditableWellPathFeature, "RicNewEditableWellPathFeature" );
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RimModeledWellPath.h"
#include "RimOilField.h"
@@ -63,11 +62,10 @@ bool RicNewEditableWellPathFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicNewEditableWellPathFeature::onActionTriggered( bool isChecked )
{
RimProject* project = RiaApplication::instance()->project();
if ( project && RiaApplication::instance()->project()->activeOilField() )
RimProject* project = RimProject::current();
if ( project && RimProject::current()->activeOilField() )
{
RimWellPathCollection* wellPathCollection =
RiaApplication::instance()->project()->activeOilField()->wellPathCollection();
RimWellPathCollection* wellPathCollection = RimProject::current()->activeOilField()->wellPathCollection();
if ( wellPathCollection )
{