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

9
ApplicationCode/CommandFileInterface/RicfApplicationTools.cpp
View File

@@ -18,7 +18,6 @@
#include "RicfApplicationTools.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RiaWellNameComparer.h"
@@ -39,7 +38,7 @@ std::vector<RimWellPath*> RicfApplicationTools::wellPathsFromNames( const QStrin
QStringList* wellsNotFound )
{
std::vector<RimWellPath*> wellPaths;
auto allWellPaths = RiaApplication::instance()->project()->allWellPaths();
auto allWellPaths = RimProject::current()->allWellPaths();
if ( !wellPathNames.empty() )
{
@@ -98,7 +97,7 @@ QStringList RicfApplicationTools::toQStringList( const std::vector<QString>& v )
//--------------------------------------------------------------------------------------------------
RimEclipseCase* RicfApplicationTools::caseFromId( int caseId )
{
auto eclipseCases = RiaApplication::instance()->project()->eclipseCases();
auto eclipseCases = RimProject::current()->eclipseCases();
if ( caseId < 0 )
{
if ( !eclipseCases.empty() ) return eclipseCases.front();
@@ -118,7 +117,7 @@ RimEclipseCase* RicfApplicationTools::caseFromId( int caseId )
//--------------------------------------------------------------------------------------------------
RimEclipseView* RicfApplicationTools::viewFromCaseIdAndViewName( int caseId, const QString& viewName )
{
for ( RimEclipseCase* c : RiaApplication::instance()->project()->eclipseCases() )
for ( RimEclipseCase* c : RimProject::current()->eclipseCases() )
{
if ( c->caseId() == caseId )
{
@@ -140,7 +139,7 @@ RimEclipseView* RicfApplicationTools::viewFromCaseIdAndViewName( int caseId, con
//--------------------------------------------------------------------------------------------------
RimEclipseView* RicfApplicationTools::viewFromCaseIdAndViewId( int caseId, int viewId )
{
for ( RimEclipseCase* c : RiaApplication::instance()->project()->eclipseCases() )
for ( RimEclipseCase* c : RimProject::current()->eclipseCases() )
{
if ( c->caseId() == caseId )
{