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

3
ApplicationCode/Commands/AnnotationCommands/RicCreateReachCircleAnnotationFeature.cpp
View File

@@ -18,7 +18,6 @@
#include "RicCreateReachCircleAnnotationFeature.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RimAnnotationCollection.h"
@@ -84,7 +83,7 @@ void RicCreateReachCircleAnnotationFeature::setupActionLook( QAction* actionToSe
//--------------------------------------------------------------------------------------------------
RimAnnotationCollection* RicCreateReachCircleAnnotationFeature::annotationCollection() const
{
auto project = RiaApplication::instance()->project();
auto project = RimProject::current();
auto oilField = project->activeOilField();
return oilField ? oilField->annotationCollection() : nullptr;
}

2
ApplicationCode/Commands/AnnotationCommands/RicCreateTextAnnotationFeature.cpp
View File

@@ -18,8 +18,6 @@
#include "RicCreateTextAnnotationFeature.h"
#include "RiaApplication.h"
#include "RimAnnotationCollection.h"
#include "RimAnnotationGroupCollection.h"
#include "RimAnnotationInViewCollection.h"

3
ApplicationCode/Commands/AnnotationCommands/RicCreateUserDefinedPolylinesAnnotationFeature.cpp
View File

@@ -18,7 +18,6 @@
#include "RicCreateUserDefinedPolylinesAnnotationFeature.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RimAnnotationCollection.h"
@@ -85,7 +84,7 @@ void RicCreateUserDefinedPolylinesAnnotationFeature::setupActionLook( QAction* a
//--------------------------------------------------------------------------------------------------
RimAnnotationCollection* RicCreateUserDefinedPolylinesAnnotationFeature::annotationCollection() const
{
auto project = RiaApplication::instance()->project();
auto project = RimProject::current();
auto oilField = project->activeOilField();
return oilField ? oilField->annotationCollection() : nullptr;
}

2
ApplicationCode/Commands/AnnotationCommands/RicDeleteAnnotationFeature.cpp
View File

@@ -18,8 +18,6 @@
#include "RicDeleteAnnotationFeature.h"
#include "RiaApplication.h"
#include "RimAnnotationCollection.h"
#include "RimAnnotationInViewCollection.h"
#include "RimOilField.h"

2
ApplicationCode/Commands/AnnotationCommands/RicImportPolylinesAnnotationFeature.cpp
View File

@@ -67,7 +67,7 @@ void RicImportPolylinesAnnotationFeature::onActionTriggered( bool isChecked )
// Find or create the AnnotationsCollection
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimAnnotationCollection* annotColl = proj->activeOilField()->annotationCollection();
if ( !annotColl )