From da8fd7038f9d82b67f38159beb6af4d932fb417c Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Mon, 23 Oct 2017 14:45:23 +0200
Subject: [PATCH] #2032 Curve Creator : Move private class to cpp

---
 .../Summary/RimCalculatedSummaryCase.cpp      | 38 ++++++++++++++++---
 .../Summary/RimCalculatedSummaryCase.h        | 25 +-----------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp
index 48d7ae26db..5d62443eae 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp
@@ -23,6 +23,32 @@
 
 CAF_PDM_SOURCE_INIT(RimCalculatedSummaryCase,"CalculatedSummaryCase");
 
+
+
+//==================================================================================================
+//
+//==================================================================================================
+class RifCalculatedSummaryCurveReader : public RifSummaryReaderInterface
+{
+public:
+    explicit RifCalculatedSummaryCurveReader(RimSummaryCalculationCollection* calculationCollection);
+
+    virtual const std::vector<time_t>&  timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
+    virtual bool                        values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override;
+    virtual std::string                 unitName(const RifEclipseSummaryAddress& resultAddress) const override;
+
+    void                                buildMetaData();
+
+private:
+    RimSummaryCalculation*              findCalculationByName(const RifEclipseSummaryAddress& resultAddress) const;
+
+private:
+    caf::PdmPointer<RimSummaryCalculationCollection> m_calculationCollection;
+};
+
+
+
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
@@ -100,7 +126,7 @@ void RimCalculatedSummaryCase::buildMetaData()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::RifCalculatedSummaryCurveReader(RimSummaryCalculationCollection* calculationCollection)
+RifCalculatedSummaryCurveReader::RifCalculatedSummaryCurveReader(RimSummaryCalculationCollection* calculationCollection)
     : m_calculationCollection(calculationCollection)
 {
 
@@ -109,7 +135,7 @@ RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::RifCalculatedSummaryC
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-const std::vector<time_t>& RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::timeSteps(const RifEclipseSummaryAddress& resultAddress) const
+const std::vector<time_t>& RifCalculatedSummaryCurveReader::timeSteps(const RifEclipseSummaryAddress& resultAddress) const
 {
     RimSummaryCalculation* calc = findCalculationByName(resultAddress);
     if (calc)
@@ -125,7 +151,7 @@ const std::vector<time_t>& RimCalculatedSummaryCase::RifCalculatedSummaryCurveRe
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const
+bool RifCalculatedSummaryCurveReader::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const
 {
     RimSummaryCalculation* calc = findCalculationByName(resultAddress);
     if (calc)
@@ -141,7 +167,7 @@ bool RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::values(const Rif
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::string RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::unitName(const RifEclipseSummaryAddress& resultAddress) const
+std::string RifCalculatedSummaryCurveReader::unitName(const RifEclipseSummaryAddress& resultAddress) const
 {
     return "Calculated Curve Unit";
 }
@@ -149,7 +175,7 @@ std::string RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::unitName(
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::buildMetaData()
+void RifCalculatedSummaryCurveReader::buildMetaData()
 {
     m_allResultAddresses.clear();
 
@@ -162,7 +188,7 @@ void RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::buildMetaData()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimSummaryCalculation* RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::findCalculationByName(const RifEclipseSummaryAddress& resultAddress) const
+RimSummaryCalculation* RifCalculatedSummaryCurveReader::findCalculationByName(const RifEclipseSummaryAddress& resultAddress) const
 {
     if (m_calculationCollection && resultAddress.category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED)
     {
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h b/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h
index 773b55368f..7b8f63ac01 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h
@@ -21,8 +21,9 @@
 #include "RimSummaryCase.h"
 #include "RifSummaryReaderInterface.h"
 
-class RimSummaryCalculationCollection;
+class RifCalculatedSummaryCurveReader;
 class RimSummaryCalculation;
+class RimSummaryCalculationCollection;
 
 
 //==================================================================================================
@@ -32,28 +33,6 @@ class RimCalculatedSummaryCase : public RimSummaryCase
 {
     CAF_PDM_HEADER_INIT;
 
-private:
-    //==================================================================================================
-    //
-    //==================================================================================================
-    class RifCalculatedSummaryCurveReader : public RifSummaryReaderInterface
-    {
-    public:
-        explicit RifCalculatedSummaryCurveReader(RimSummaryCalculationCollection* calculationCollection);
-
-        virtual const std::vector<time_t>&  timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
-        virtual bool                        values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override;
-        virtual std::string                 unitName(const RifEclipseSummaryAddress& resultAddress) const override;
-
-        void                                buildMetaData();
-
-    private:
-        RimSummaryCalculation*                     findCalculationByName(const RifEclipseSummaryAddress& resultAddress) const;
-
-    private:
-        caf::PdmPointer<RimSummaryCalculationCollection> m_calculationCollection;
-    };
-
 public:
     RimCalculatedSummaryCase();
     virtual ~RimCalculatedSummaryCase();