Replace RiaApplication::instance()->project() with RimProject::current().

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

View File

@@ -19,7 +19,6 @@
#include "RicMoveWellLogFilesFeature.h"
#include "RiaApplication.h"
#include "RimProject.h"
#include "RimWellLogFile.h"
#include "RimWellPath.h"
@@ -43,7 +42,7 @@ bool RicMoveWellLogFilesFeature::isCommandEnabled()
if ( !selectedWellLogFile ) return false;
// If only one well path exists, the move command is not applicable
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
return proj->allWellPaths().size() > 1;
}
@@ -55,7 +54,7 @@ void RicMoveWellLogFilesFeature::onActionTriggered( bool isChecked )
const QVariant userData = this->userData();
if ( !userData.isNull() && userData.type() == QVariant::String )
{
RimProject* proj = RiaApplication::instance()->project();
RimProject* proj = RimProject::current();
RimWellPath* destWellPath = proj->wellPathByName( userData.toString() );
RimWellLogFile* wellLogFile = caf::firstAncestorOfTypeFromSelectedObject<RimWellLogFile*>();