(#435) Renamed class

OPM · Sep 15, 2015 · 03e4b89 · 03e4b89
1 parent 01118fa
commit 03e4b89
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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/...onCode/ProjectDataModel/RimWellLasLog.cpp → ...ationCode/ProjectDataModel/RimWellLog.cpp b/...onCode/ProjectDataModel/RimWellLasLog.cpp → ...ationCode/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;
 }
diff --git a/...tionCode/ProjectDataModel/RimWellLasLog.h → ...icationCode/ProjectDataModel/RimWellLog.h b/...tionCode/ProjectDataModel/RimWellLasLog.h → ...icationCode/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);