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 @@ RimEclipseView* RicSelectOrCreateViewFeatureImpl::showViewSelection( RimEclipseR
}
QString refFromProjectToView =
caf::PdmReferenceHelper::referenceFromRootToObject( RiaApplication::instance()->project(), viewToManipulate );
caf::PdmReferenceHelper::referenceFromRootToObject( RimProject::current(), viewToManipulate );
RiaApplication::instance()->setCacheDataObject( lastUsedViewKey, refFromProjectToView );
return viewToManipulate;
@@ -100,7 +100,7 @@ RimEclipseView* RicSelectOrCreateViewFeatureImpl::getDefaultSelectedView( RimEcl
QString lastUsedViewRef = RiaApplication::instance()->cacheDataObject( lastUsedViewKey ).toString();
RimEclipseView* lastUsedView = dynamic_cast<RimEclipseView*>(
caf::PdmReferenceHelper::objectFromReference( RiaApplication::instance()->project(), lastUsedViewRef ) );
caf::PdmReferenceHelper::objectFromReference( RimProject::current(), lastUsedViewRef ) );
if ( lastUsedView )
{
RimEclipseResultCase* lastUsedViewResultCase = nullptr;