From bd563df02eda14ccb2df6f39cce9ece14cba6400 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetron.com>
Date: Mon, 8 Apr 2013 14:29:43 +0200
Subject: [PATCH] Use setter instead of overloaded constructor p4#: 21177

---
 .../Application/RiaApplication.cpp            |  9 +++++---
 .../ProjectDataModel/RimResultCase.cpp        | 21 +++++++++----------
 .../ProjectDataModel/RimResultCase.h          |  3 ++-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp
index ff331c7cd9..ff270910a6 100644
--- a/ApplicationCode/Application/RiaApplication.cpp
+++ b/ApplicationCode/Application/RiaApplication.cpp
@@ -500,7 +500,8 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
     QFileInfo gridFileName(caseFileName);
     QString casePath = gridFileName.absolutePath();
 
-    RimResultCase* rimResultReservoir = new RimResultCase(caseName, caseFileName, casePath);
+    RimResultCase* rimResultReservoir = new RimResultCase();
+    rimResultReservoir->setCaseInfo(caseName, caseFileName, casePath);
 
     m_project->reservoirs.push_back(rimResultReservoir);
 
@@ -1372,7 +1373,8 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames)
         QString caseName = gridFileName.completeBaseName();
         QString casePath = gridFileName.absolutePath();
 
-        RimResultCase* rimResultReservoir = new RimResultCase(caseName, firstFileName, casePath);
+        RimResultCase* rimResultReservoir = new RimResultCase();
+        rimResultReservoir->setCaseInfo(caseName, firstFileName, casePath);
         if (!rimResultReservoir->openEclipseGridFile())
         {
             delete rimResultReservoir;
@@ -1398,7 +1400,8 @@ bool RiaApplication::addEclipseCases(const QStringList& fileNames)
         QString caseName = gridFileName.completeBaseName();
         QString casePath = gridFileName.absolutePath();
 
-        RimResultCase* rimResultReservoir = new RimResultCase(caseName, caseFileName, casePath);
+        RimResultCase* rimResultReservoir = new RimResultCase();
+        rimResultReservoir->setCaseInfo(caseName, caseFileName, casePath);
 
         std::vector< std::vector<int> > caseGridDimensions;
         rimResultReservoir->readGridDimensions(caseGridDimensions);
diff --git a/ApplicationCode/ProjectDataModel/RimResultCase.cpp b/ApplicationCode/ProjectDataModel/RimResultCase.cpp
index d7a8553131..4fdf6275cf 100644
--- a/ApplicationCode/ProjectDataModel/RimResultCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimResultCase.cpp
@@ -43,17 +43,6 @@ RimResultCase::RimResultCase()
     CAF_PDM_InitField(&caseDirectory, "CaseFolder", QString(), "Directory", "", "" ,"");
 }
 
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-RimResultCase::RimResultCase(const QString& caseName, const QString& caseFileName, const QString& caseDirectory)
-{
-    RimResultCase();
-
-    this->caseName      = caseName;
-    this->caseFileName  = caseFileName;
-    this->caseDirectory = caseDirectory;
-}
 
 
 //--------------------------------------------------------------------------------------------------
@@ -308,3 +297,13 @@ void RimResultCase::updateFilePathsFromProjectPath(const QString& projectPath)
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimResultCase::setCaseInfo(const QString& caseName, const QString& caseFileName, const QString& caseDirectory)
+{
+    this->caseName      = caseName;
+    this->caseFileName  = caseFileName;
+    this->caseDirectory = caseDirectory;
+}
+
diff --git a/ApplicationCode/ProjectDataModel/RimResultCase.h b/ApplicationCode/ProjectDataModel/RimResultCase.h
index 1b8463a61a..bceeeec3b6 100644
--- a/ApplicationCode/ProjectDataModel/RimResultCase.h
+++ b/ApplicationCode/ProjectDataModel/RimResultCase.h
@@ -38,13 +38,14 @@ class RimResultCase : public RimCase
 
 public:
     RimResultCase();
-    RimResultCase(const QString& caseName, const QString& caseFileName, const QString& caseDirectory);
     virtual ~RimResultCase();
 
     // Fields:                        
     caf::PdmField<QString>      caseFileName;
     caf::PdmField<QString>      caseDirectory;
 
+    void                        setCaseInfo(const QString& caseName, const QString& caseFileName, const QString& caseDirectory);
+
     virtual bool                openEclipseGridFile();
     bool                        openAndReadActiveCellData(RigCaseData* mainEclipseCase);
     void                        readGridDimensions(std::vector< std::vector<int> >& gridDimensions);