From 69c21df6a3c1eb9688bab38769af5f351d14ac2f Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Thu, 22 Oct 2020 08:55:26 +0200 Subject: [PATCH] A couple of example uses of cvf::make_ref --- ApplicationCode/Application/RiaGuiApplication.cpp | 2 +- ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp | 2 +- ApplicationCode/CommandFileInterface/RicfReplaceCase.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/Application/RiaGuiApplication.cpp b/ApplicationCode/Application/RiaGuiApplication.cpp index 1b4284eeaa..52dc5682b7 100644 --- a/ApplicationCode/Application/RiaGuiApplication.cpp +++ b/ApplicationCode/Application/RiaGuiApplication.cpp @@ -600,7 +600,7 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( gsl::not_n if ( cvf::Option o = progOpt->option( "replaceCase" ) ) { - if ( projectModifier.isNull() ) projectModifier = new RiaProjectModifier; + if ( projectModifier.isNull() ) projectModifier = cvf::make_ref(); if ( o.valueCount() == 1 ) { diff --git a/ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp b/ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp index ccb7a04165..f58d1249e7 100644 --- a/ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp +++ b/ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp @@ -198,7 +198,7 @@ void RiaRegressionTestRunner::runRegressionTest() cvf::ref projectModifier; if ( regressionTestConfig.invalidateExternalFilePaths ) { - projectModifier = new RiaProjectModifier; + projectModifier = cvf::make_ref(); projectModifier->setInvalidateExternalFilePaths(); } logInfoTextWithTimeInSeconds( timeStamp, "Initializing test :" + testCaseFolder.absolutePath() ); diff --git a/ApplicationCode/CommandFileInterface/RicfReplaceCase.cpp b/ApplicationCode/CommandFileInterface/RicfReplaceCase.cpp index 7de88bcd84..1cd99cc4af 100644 --- a/ApplicationCode/CommandFileInterface/RicfReplaceCase.cpp +++ b/ApplicationCode/CommandFileInterface/RicfReplaceCase.cpp @@ -76,7 +76,7 @@ caf::PdmScriptResponse RicfSingleCaseReplace::execute() projectPath = lastProjectPath; } - cvf::ref projectModifier = new RiaProjectModifier; + cvf::ref projectModifier = cvf::make_ref(); QString filePath = m_newGridFile(); QFileInfo casePathInfo( filePath ); @@ -145,7 +145,7 @@ caf::PdmScriptResponse RicfMultiCaseReplace::execute() return caf::PdmScriptResponse( caf::PdmScriptResponse::COMMAND_ERROR, errMsg ); } - cvf::ref projectModifier = new RiaProjectModifier; + cvf::ref projectModifier = cvf::make_ref(); for ( const auto& a : m_caseIdToGridFileNameMap ) { const int caseId = a.first;