From 03e4b89508f845018f48d95d6c14e6abe3f942e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A5l=20Hagen?= <pal@applicano.com>
Date: Tue, 15 Sep 2015 13:21:30 +0200
Subject: [PATCH] (#435) Renamed class

---
 .../ProjectDataModel/CMakeLists_files.cmake            |  4 ++--
 .../ProjectDataModel/RimWellLasFileInfo.cpp            |  4 ++--
 ApplicationCode/ProjectDataModel/RimWellLasFileInfo.h  |  4 ++--
 .../{RimWellLasLog.cpp => RimWellLog.cpp}              | 10 +++++-----
 .../ProjectDataModel/{RimWellLasLog.h => RimWellLog.h} |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename ApplicationCode/ProjectDataModel/{RimWellLasLog.cpp => RimWellLog.cpp} (87%)
 rename ApplicationCode/ProjectDataModel/{RimWellLasLog.h => RimWellLog.h} (95%)

diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
index ac068fc923..5932e2adea 100644
--- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
+++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
@@ -69,7 +69,7 @@ ${CEE_CURRENT_LIST_DIR}RimViewLinker.h
 ${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.h
 ${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.h
 ${CEE_CURRENT_LIST_DIR}RimWellLasFileInfo.h
-${CEE_CURRENT_LIST_DIR}RimWellLasLog.h
+${CEE_CURRENT_LIST_DIR}RimWellLog.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -137,7 +137,7 @@ ${CEE_CURRENT_LIST_DIR}RimViewLinker.cpp
 ${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.cpp
 ${CEE_CURRENT_LIST_DIR}RimWellLasFileInfo.cpp
-${CEE_CURRENT_LIST_DIR}RimWellLasLog.cpp
+${CEE_CURRENT_LIST_DIR}RimWellLog.cpp
 )
 
 list(APPEND CODE_HEADER_FILES
diff --git a/ApplicationCode/ProjectDataModel/RimWellLasFileInfo.cpp b/ApplicationCode/ProjectDataModel/RimWellLasFileInfo.cpp
index ad7c122ce9..cb06691a45 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLasFileInfo.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellLasFileInfo.cpp
@@ -18,7 +18,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RimWellLasFileInfo.h"
-#include "RimWellLasLog.h"
+#include "RimWellLog.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
 
@@ -110,7 +110,7 @@ bool RimWellLasFileInfo::readFile()
 
     for (size_t logIdx = 0; logIdx < wellLogNames.size(); logIdx++)
     {
-        RimWellLasLog* wellLog = new RimWellLasLog();
+        RimWellLog* wellLog = new RimWellLog();
         wellLog->setName(wellLogNames[logIdx]);
         m_lasFileLogs.push_back(wellLog);
     }
diff --git a/ApplicationCode/ProjectDataModel/RimWellLasFileInfo.h b/ApplicationCode/ProjectDataModel/RimWellLasFileInfo.h
index 53b4545cb3..c6403b3bbe 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLasFileInfo.h
+++ b/ApplicationCode/ProjectDataModel/RimWellLasFileInfo.h
@@ -24,7 +24,7 @@
 #include "cafPdmChildArrayField.h"
 
 
-class RimWellLasLog;
+class RimWellLog;
 class QString;
 
 
@@ -49,7 +49,7 @@ class RimWellLasFileInfo : public caf::PdmObject
     virtual caf::PdmFieldHandle* userDescriptionField()  { return &m_name; }
 
 private:
-    caf::PdmChildArrayField<RimWellLasLog*>  m_lasFileLogs;
+    caf::PdmChildArrayField<RimWellLog*>  m_lasFileLogs;
 
 private:
     caf::PdmField<QString> m_wellName;
diff --git a/ApplicationCode/ProjectDataModel/RimWellLasLog.cpp b/ApplicationCode/ProjectDataModel/RimWellLog.cpp
similarity index 87%
rename from ApplicationCode/ProjectDataModel/RimWellLasLog.cpp
rename to ApplicationCode/ProjectDataModel/RimWellLog.cpp
index d8fe479271..d61fb264f6 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLasLog.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellLog.cpp
@@ -17,19 +17,19 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimWellLasLog.h"
+#include "RimWellLog.h"
 
 #include <QString>
 
 
-CAF_PDM_SOURCE_INIT(RimWellLasLog, "WellLasLog");
+CAF_PDM_SOURCE_INIT(RimWellLog, "WellLog");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimWellLasLog::RimWellLasLog()
+RimWellLog::RimWellLog()
 {
-    CAF_PDM_InitObject("Well LAS File Log", "", "", "");
+    CAF_PDM_InitObject("Well Log", "", "", "");
 
     CAF_PDM_InitFieldNoDefault(&m_name, "Name", "",  "", "", "");
     m_name.uiCapability()->setUiHidden(true);
@@ -39,7 +39,7 @@ RimWellLasLog::RimWellLasLog()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellLasLog::setName(const QString& name)
+void RimWellLog::setName(const QString& name)
 {
     m_name = name;
 }
\ No newline at end of file
diff --git a/ApplicationCode/ProjectDataModel/RimWellLasLog.h b/ApplicationCode/ProjectDataModel/RimWellLog.h
similarity index 95%
rename from ApplicationCode/ProjectDataModel/RimWellLasLog.h
rename to ApplicationCode/ProjectDataModel/RimWellLog.h
index 52d3d89bf2..785caa1108 100644
--- a/ApplicationCode/ProjectDataModel/RimWellLasLog.h
+++ b/ApplicationCode/ProjectDataModel/RimWellLog.h
@@ -28,12 +28,12 @@ class QString;
 ///  
 ///  
 //==================================================================================================
-class RimWellLasLog : public caf::PdmObject
+class RimWellLog : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
 
 public:
-    RimWellLasLog();
+    RimWellLog();
     
     void setName(const QString& name);