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

8
ApplicationCode/GrpcInterface/RiaGrpcProjectService.cpp
View File

@@ -78,7 +78,7 @@ grpc::Status RiaGrpcProjectService::GetAllCaseGroups( grpc::ServerContext* conte
const rips::Empty* request,
rips::CaseGroups* reply )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimEclipseCaseCollection* analysisModels =
( proj && proj->activeOilField() ) ? proj->activeOilField()->analysisModels() : nullptr;
if ( analysisModels )
@@ -102,7 +102,7 @@ grpc::Status RiaGrpcProjectService::GetAllCases( grpc::ServerContext* context,
rips::CaseInfoArray* reply )
{
std::vector<RimCase*> cases;
RiaApplication::instance()->project()->allCases( cases );
RimProject::current()->allCases( cases );
if ( cases.empty() )
{
@@ -132,7 +132,7 @@ grpc::Status RiaGrpcProjectService::GetCasesInGroup( grpc::ServerContext* cont
const rips::CaseGroup* request,
rips::CaseInfoArray* reply )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimEclipseCaseCollection* analysisModels =
( proj && proj->activeOilField() ) ? proj->activeOilField()->analysisModels() : nullptr;
if ( analysisModels )
@@ -189,7 +189,7 @@ grpc::Status RiaGrpcProjectService::GetCasesInGroup( grpc::ServerContext* cont
grpc::Status
RiaGrpcProjectService::GetPdmObject( grpc::ServerContext* context, const rips::Empty* request, rips::PdmObject* reply )
{
RimProject* project = RiaApplication::instance()->project();
RimProject* project = RimProject::current();
if ( project )
{
copyPdmObjectFromCafToRips( project, reply );