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 @@
#include "RimCase.h"
#include "RiaApplication.h"
#include "RicfCommandObject.h"
#include "RimFormationNames.h"
@@ -192,7 +191,7 @@ QList<caf::PdmOptionItemInfo> RimCase::calculateValueOptions( const caf::PdmFiel
if ( fieldNeedingOptions == &m_activeFormationNames )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
if ( proj && proj->activeOilField() && proj->activeOilField()->formationNamesCollection() )
{
for ( RimFormationNames* fnames : proj->activeOilField()->formationNamesCollection()->formationNamesList() )
@@ -217,7 +216,7 @@ void RimCase::initAfterRead()
{
if ( caseId() == -1 )
{
RiaApplication::instance()->project()->assignCaseIdToCase( this );
RimProject::current()->assignCaseIdToCase( this );
}
}