From deb62d81988b1327fbc07cef50935dbbb321cbb1 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 9 Mar 2017 07:08:42 +0100 Subject: [PATCH] #1305 Removed use of unique_pointer --- .../ProjectDataModel/Summary/RimSummaryCurve.cpp | 11 ++++------- .../ProjectDataModel/Summary/RimSummaryCurve.h | 6 ------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index a990d27cc1..9ee7cdf4f3 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -32,6 +32,7 @@ #include "RimSummaryCurveFilter.h" #include "RimSummaryFilter.h" #include "RimSummaryPlot.h" +#include "RimSummaryTimeAxisProperties.h" #include "RiuLineSegmentQwtPlotCurve.h" #include "RiuSummaryQwtPlot.h" @@ -41,7 +42,6 @@ #include "cafPdmUiTreeOrdering.h" #include "qwt_date.h" -#include "RimSummaryTimeAxisProperties.h" CAF_PDM_SOURCE_INIT(RimSummaryAddress, "SummaryAddress"); @@ -156,8 +156,7 @@ RimSummaryCurve::RimSummaryCurve() m_summaryFilter.uiCapability()->setUiTreeChildrenHidden(true); m_summaryFilter.uiCapability()->setUiHidden(true); - m_summaryFilterObject = std::unique_ptr(new RimSummaryFilter); - m_summaryFilter = m_summaryFilterObject.get(); + m_summaryFilter = new RimSummaryFilter; CAF_PDM_InitFieldNoDefault(&m_uiFilterResultSelection, "FilterResultSelection", "Filter Result", "", "", ""); m_uiFilterResultSelection.xmlCapability()->setIOWritable(false); @@ -170,8 +169,7 @@ RimSummaryCurve::RimSummaryCurve() m_curveVariable.uiCapability()->setUiHidden(true); m_curveVariable.uiCapability()->setUiTreeChildrenHidden(true); - m_curveVariableObject = std::unique_ptr(new RimSummaryAddress); - m_curveVariable = m_curveVariableObject.get(); + m_curveVariable = new RimSummaryAddress; CAF_PDM_InitFieldNoDefault(&m_plotAxis, "PlotAxis", "Axis", "", "", ""); @@ -179,8 +177,7 @@ RimSummaryCurve::RimSummaryCurve() m_curveNameConfig.uiCapability()->setUiHidden(true); m_curveNameConfig.uiCapability()->setUiTreeChildrenHidden(true); - m_curveNameConfigObject = std::unique_ptr(new RimSummaryCurveAutoName); - m_curveNameConfig = m_curveNameConfigObject.get(); + m_curveNameConfig = new RimSummaryCurveAutoName; m_symbolSkipPixelDistance = 10.0f; m_curveThickness = 2; diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h index ff357156e0..a670ea1826 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h @@ -31,7 +31,6 @@ #include "cafAppEnum.h" -#include class RifReaderEclipseSummary; class RimSummaryCase; @@ -125,9 +124,4 @@ private: // Filter fields caf::PdmChildField m_summaryFilter; caf::PdmField m_uiFilterResultSelection; - - // Internal objects managed by unique_ptr - std::unique_ptr m_curveVariableObject; - std::unique_ptr m_summaryFilterObject; - std::unique_ptr m_curveNameConfigObject; };