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

2
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp
View File

@@ -16,8 +16,6 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiaApplication.h"
#include "RicExportCompletionDataSettingsUi.h"
#include "RicExportFractureCompletionsImpl.h"

4
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsForTemporaryLgrsFeature.cpp
View File

@@ -18,8 +18,6 @@
#include "RicExportCompletionsForTemporaryLgrsFeature.h"
#include "RiaApplication.h"
#include "RicWellPathExportCompletionDataFeature.h"
#include "RigMainGrid.h"
@@ -102,7 +100,7 @@ std::vector<RimWellPath*> RicExportCompletionsForTemporaryLgrsFeature::wellPaths
}
}
auto project = RiaApplication::instance()->project();
auto project = RimProject::current();
for ( const auto& wellPathName : wellPathNames )
{
auto wellPath = project->wellPathByName( wellPathName );

4
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionsForVisibleWellPathsFeature.cpp
View File

@@ -18,8 +18,6 @@
#include "RicExportCompletionsForVisibleWellPathsFeature.h"
#include "RiaApplication.h"
#include "RicWellPathExportCompletionDataFeature.h"
#include "RiuPlotMainWindow.h"
@@ -143,7 +141,7 @@ std::vector<RimWellPath*> RicExportCompletionsForVisibleWellPathsFeature::visibl
{
// No well path or well path collection selected
auto allWellPaths = RiaApplication::instance()->project()->allWellPaths();
auto allWellPaths = RimProject::current()->allWellPaths();
for ( const auto& w : allWellPaths )
{
if ( w->showWellPath() )

3
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionsFileTools.cpp
View File

@@ -18,7 +18,6 @@
#include "RicWellPathExportCompletionsFileTools.h"
#include "RiaApplication.h"
#include "RiaFilePathTools.h"
#include "RiaLogging.h"
@@ -85,7 +84,7 @@ std::shared_ptr<QFile> RicWellPathExportCompletionsFileTools::openFileForExport(
//--------------------------------------------------------------------------------------------------
const RimWellPath* RicWellPathExportCompletionsFileTools::findWellPathFromExportName( const QString& wellNameForExport )
{
auto allWellPaths = RiaApplication::instance()->project()->allWellPaths();
auto allWellPaths = RimProject::current()->allWellPaths();
for ( const auto wellPath : allWellPaths )
{

3
ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureTextReportFeatureImpl.cpp
View File

@@ -18,7 +18,6 @@
#include "RicWellPathFractureTextReportFeatureImpl.h"
#include "RiaApplication.h"
#include "RiaRegressionTestRunner.h"
#include "RicExportFractureCompletionsImpl.h"
@@ -85,7 +84,7 @@ QString RicWellPathFractureTextReportFeatureImpl::wellPathFractureReport(
std::vector<RimEllipseFractureTemplate*> ellipseTemplates;
{
auto proj = RiaApplication::instance()->project();
auto proj = RimProject::current();
auto fractureTemplates = proj->activeOilField()->fractureDefinitionCollection()->fractureTemplates();
std::set<QString> usedFractureTemplateNames;