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

6
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@@ -73,7 +73,7 @@ RimEclipseResultCase::RimEclipseResultCase()
CAF_PDM_InitScriptableObject( "Eclipse Case", ":/Case48x48.png", "", "The Regular Eclipse Results Case" );
CAF_PDM_InitFieldNoDefault( &m_unitSystem, "UnitSystem", "Unit System", "", "", "" );
m_unitSystem.registerGetMethod( RiaApplication::instance()->project(), &RimProject::commonUnitSystemForAllCases );
m_unitSystem.registerGetMethod( RimProject::current(), &RimProject::commonUnitSystemForAllCases );
m_unitSystem.uiCapability()->setUiReadOnly( true );
CAF_PDM_InitFieldNoDefault( &m_flowDiagSolutions, "FlowDiagSolutions", "Flow Diagnostics Solutions", "", "", "" );
@@ -408,7 +408,7 @@ cvf::ref<RifReaderInterface> RimEclipseResultCase::createMockModel( QString mode
{
QApplication::setOverrideCursor( QCursor( Qt::ArrowCursor ) );
RimMockModelSettings* mockModelSettings = RiaApplication::instance()->project()->dialogData()->mockModelSettings();
RimMockModelSettings* mockModelSettings = RimProject::current()->dialogData()->mockModelSettings();
if ( !RiaRegressionTestRunner::instance()->isRunningRegressionTests() )
{
@@ -559,7 +559,7 @@ void RimEclipseResultCase::setCaseInfo( const QString& userDescription, const QS
this->caseUserDescription = userDescription;
setGridFileName( fileName );
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
proj->assignCaseIdToCase( this );
}