From 79905ae47490eee36a79fc66d4f1ccb204d61056 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Sun, 19 Mar 2017 09:29:44 +0100
Subject: [PATCH] #1322 Removed unique_ptr from summary curve filter

---
 .../ProjectDataModel/Summary/RimSummaryCurveFilter.cpp    | 6 ++----
 .../ProjectDataModel/Summary/RimSummaryCurveFilter.h      | 8 --------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp
index 83b1d4e540..480a302a51 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp
@@ -78,8 +78,7 @@ RimSummaryCurveFilter::RimSummaryCurveFilter()
     m_summaryFilter.uiCapability()->setUiTreeChildrenHidden(true);
     m_summaryFilter.uiCapability()->setUiHidden(true);
 
-    m_summaryFilterObject = std::unique_ptr<RimSummaryFilter>(new RimSummaryFilter);
-    m_summaryFilter = m_summaryFilterObject.get();
+    m_summaryFilter = new RimSummaryFilter;
 
     CAF_PDM_InitFieldNoDefault(&m_uiFilterResultMultiSelection, "FilterResultSelection", "Filter Result", "", "Ctrl-A : Select All", "");
     m_uiFilterResultMultiSelection.xmlCapability()->setIOWritable(false);
@@ -118,8 +117,7 @@ RimSummaryCurveFilter::RimSummaryCurveFilter()
     m_curveNameConfig.uiCapability()->setUiHidden(true);
     m_curveNameConfig.uiCapability()->setUiTreeChildrenHidden(true);
 
-    m_curveNameConfigObject = std::unique_ptr<RimSummaryCurveAutoName>(new RimSummaryCurveAutoName);
-    m_curveNameConfig = m_curveNameConfigObject.get();
+    m_curveNameConfig = new RimSummaryCurveAutoName;
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.h
index b7c9bac074..9af62f6d72 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.h
@@ -33,9 +33,6 @@
 #include "RimDefines.h"
 #include "RimSummaryCurveAppearanceCalculator.h"
 
-
-#include <memory>
-
 class QwtPlot;
 class QwtPlotCurve;
 class RifReaderEclipseSummary;
@@ -46,7 +43,6 @@ class RiuLineSegmentQwtPlotCurve;
 class RimSummaryCurveAutoName;
 
 
-
 Q_DECLARE_METATYPE(RifEclipseSummaryAddress);
 
 //==================================================================================================
@@ -132,9 +128,5 @@ private:
     caf::PdmField< AppearanceTypeAppEnum >  m_regionAppearanceType;
 
     std::vector< caf::PdmPointer<RimSummaryCase> > m_selectionCache;
-
-    // Internal objects managed by unique_ptr
-    std::unique_ptr<RimSummaryFilter>        m_summaryFilterObject;
-    std::unique_ptr<RimSummaryCurveAutoName> m_curveNameConfigObject;
 };