From ccb88c652088c17d852d05444a24e05907e7459d Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 13 Jan 2017 09:51:37 +0100
Subject: [PATCH] Rename

---
 ApplicationCode/Application/RiaApplication.cpp            | 6 +++---
 .../SummaryPlotCommands/RicNewSummaryPlotFeature.cpp      | 4 ++--
 .../SummaryPlotCommands/RicPasteSummaryPlotFeature.cpp    | 2 +-
 .../ProjectDataModel/RimMainPlotCollection.cpp            | 2 +-
 .../ProjectDataModel/Summary/RimSummaryPlotCollection.cpp | 8 ++++----
 .../ProjectDataModel/Summary/RimSummaryPlotCollection.h   | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp
index d398c5c4e2..cdbd4d988d 100644
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@@ -565,7 +565,7 @@ void RiaApplication::loadAndUpdatePlotData()
     }
     size_t plotCount = 0;
     plotCount += wlpColl ? wlpColl->wellLogPlots().size() : 0;
-    plotCount += spColl ? spColl->m_summaryPlots().size() : 0;
+    plotCount += spColl ? spColl->summaryPlots().size() : 0;
 
     caf::ProgressInfo plotProgress(plotCount, "Loading Plot Data");
     if (wlpColl)
@@ -579,9 +579,9 @@ void RiaApplication::loadAndUpdatePlotData()
 
     if (spColl)
     {
-        for (size_t wlpIdx = 0; wlpIdx < spColl->m_summaryPlots().size(); ++wlpIdx)
+        for (size_t wlpIdx = 0; wlpIdx < spColl->summaryPlots().size(); ++wlpIdx)
         {
-            spColl->m_summaryPlots[wlpIdx]->loadDataAndUpdate();
+            spColl->summaryPlots[wlpIdx]->loadDataAndUpdate();
             plotProgress.incrementProgress();
         }
     }
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp
index 59e5de32e1..9bee510e0e 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp
@@ -96,9 +96,9 @@ void RicNewSummaryPlotFeature::setupActionLook(QAction* actionToSetup)
 void RicNewSummaryPlotFeature::createNewSummaryPlot(RimSummaryPlotCollection* summaryPlotColl, RimSummaryCase* summaryCase)
 {
     RimSummaryPlot* plot = new RimSummaryPlot();
-    summaryPlotColl->m_summaryPlots().push_back(plot);
+    summaryPlotColl->summaryPlots().push_back(plot);
 
-    plot->setDescription(QString("Summary Plot %1").arg(summaryPlotColl->m_summaryPlots.size()));
+    plot->setDescription(QString("Summary Plot %1").arg(summaryPlotColl->summaryPlots.size()));
 
     RimSummaryCurveFilter* newCurveFilter = new RimSummaryCurveFilter();
 
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteSummaryPlotFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteSummaryPlotFeature.cpp
index db42edd5cf..62a519e28f 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteSummaryPlotFeature.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteSummaryPlotFeature.cpp
@@ -74,7 +74,7 @@ void RicPasteSummaryPlotFeature::onActionTriggered(bool isChecked)
         RimSummaryPlot* newSummaryPlot = dynamic_cast<RimSummaryPlot*>(sourceObjects[i]->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
         CVF_ASSERT(newSummaryPlot);
 
-        plotColl->m_summaryPlots.push_back(newSummaryPlot);
+        plotColl->summaryPlots.push_back(newSummaryPlot);
 
         // Resolve references after object has been inserted into the data model
         newSummaryPlot->resolveReferencesRecursively();
diff --git a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp
index 523aec4d85..06ffd1cf9d 100644
--- a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp
@@ -168,7 +168,7 @@ RimFlowPlotCollection* RimMainPlotCollection::flowPlotCollection()
 void RimMainPlotCollection::deleteAllContainedObjects()
 {
     m_wellLogPlotCollection()->wellLogPlots.deleteAllChildObjects();
-    m_summaryPlotCollection()->m_summaryPlots.deleteAllChildObjects();
+    m_summaryPlotCollection()->summaryPlots.deleteAllChildObjects();
     m_flowPlotCollection()->flowPlots.deleteAllChildObjects();
 }
 
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp
index 5eea46d180..c4463b7476 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp
@@ -40,8 +40,8 @@ RimSummaryPlotCollection::RimSummaryPlotCollection()
 {
     CAF_PDM_InitObject("Summary Plots", ":/SummaryPlots16x16.png", "", "");
 
-    CAF_PDM_InitFieldNoDefault(&m_summaryPlots, "SummaryPlots", "Summary Plots",  "", "", "");
-    m_summaryPlots.uiCapability()->setUiHidden(true);
+    CAF_PDM_InitFieldNoDefault(&summaryPlots, "SummaryPlots", "Summary Plots",  "", "", "");
+    summaryPlots.uiCapability()->setUiHidden(true);
 
 }
 
@@ -50,7 +50,7 @@ RimSummaryPlotCollection::RimSummaryPlotCollection()
 //--------------------------------------------------------------------------------------------------
 RimSummaryPlotCollection::~RimSummaryPlotCollection()
 {
-    m_summaryPlots.deleteAllChildObjects();
+    summaryPlots.deleteAllChildObjects();
 
     for (auto it = m_summaryFileReaders.begin(); it != m_summaryFileReaders.end(); it++)
     {
@@ -124,7 +124,7 @@ RifReaderEclipseSummary* RimSummaryPlotCollection::createSummaryFileReader(const
 //--------------------------------------------------------------------------------------------------
 void RimSummaryPlotCollection::updateSummaryNameHasChanged()
 {
-    for (RimSummaryPlot* plot : m_summaryPlots)
+    for (RimSummaryPlot* plot : summaryPlots)
     {
         plot->updateCaseNameHasChanged();
     }
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h
index 00afb0d151..c675f478f5 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h
@@ -43,7 +43,7 @@ public:
 
     RifReaderEclipseSummary* getOrCreateSummaryFileReader(const RimEclipseResultCase* eclipseCase);
 
-    caf::PdmChildArrayField<RimSummaryPlot*> m_summaryPlots;
+    caf::PdmChildArrayField<RimSummaryPlot*> summaryPlots;
 
     void updateSummaryNameHasChanged();
 private: