OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1305 Removed use of unique_pointer

Browse Source
This commit is contained in:
Magne Sjaastad 2017-03-09 07:08:42 +01:00
parent 6c6049a317
commit deb62d8198
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -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<RimSummaryFilter>(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<RimSummaryAddress>(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<RimSummaryCurveAutoName>(new RimSummaryCurveAutoName);
m_curveNameConfig = m_curveNameConfigObject.get();
m_curveNameConfig = new RimSummaryCurveAutoName;
m_symbolSkipPixelDistance = 10.0f;
m_curveThickness = 2;

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h
View File

@ -31,7 +31,6 @@
#include "cafAppEnum.h"
#include <memory>
class RifReaderEclipseSummary;
class RimSummaryCase;
@ -125,9 +124,4 @@ private:
// Filter fields
caf::PdmChildField<RimSummaryFilter*> m_summaryFilter;
caf::PdmField<int> m_uiFilterResultSelection;
// Internal objects managed by unique_ptr
std::unique_ptr<RimSummaryAddress> m_curveVariableObject;
std::unique_ptr<RimSummaryFilter> m_summaryFilterObject;
std::unique_ptr<RimSummaryCurveAutoName> m_curveNameConfigObject;
};