From dc82888ede60e95b4282e0d64d2e36b60e9052d6 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 23 Oct 2017 20:20:18 +0200 Subject: [PATCH] #2031 Curve Calculator : Use unique_ptr --- .../ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp | 4 ++-- .../ProjectDataModel/Summary/RimCalculatedSummaryCase.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp index 5d62443eae..4aa999a125 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp @@ -84,7 +84,7 @@ void RimCalculatedSummaryCase::createSummaryReaderInterface() RimSummaryCalculationCollection* calculationCollection = nullptr; this->firstAncestorOrThisOfTypeAsserted(calculationCollection); - m_calculatedCurveReader = new RifCalculatedSummaryCurveReader(calculationCollection); + m_calculatedCurveReader.reset(new RifCalculatedSummaryCurveReader(calculationCollection)); m_calculatedCurveReader->buildMetaData(); } @@ -97,7 +97,7 @@ RifSummaryReaderInterface* RimCalculatedSummaryCase::summaryReader() { if (!m_calculatedCurveReader) createSummaryReaderInterface(); - return m_calculatedCurveReader; + return m_calculatedCurveReader.get(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h b/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h index 7b8f63ac01..a90524cdad 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h @@ -21,6 +21,8 @@ #include "RimSummaryCase.h" #include "RifSummaryReaderInterface.h" +#include + class RifCalculatedSummaryCurveReader; class RimSummaryCalculation; class RimSummaryCalculationCollection; @@ -45,5 +47,5 @@ public: void buildMetaData(); private: - RifCalculatedSummaryCurveReader* m_calculatedCurveReader; + std::unique_ptr m_calculatedCurveReader; };