From 32817d2cc6593bab92b5b6c2d9af75e8aa757062 Mon Sep 17 00:00:00 2001
From: Gaute Lindkvist <lindkvis@gmail.com>
Date: Wed, 9 Oct 2019 09:27:26 +0200
Subject: [PATCH] Renamed RicWellPathsImportFileFeature to RicImportWellPaths

---
 .../CommandFileInterface/RicfImportWellPaths.cpp |  8 ++++----
 .../WellPathCommands/CMakeLists_files.cmake      |  4 ++--
 ...ortFileFeature.cpp => RicImportWellPaths.cpp} | 16 ++++++++--------
 ...sImportFileFeature.h => RicImportWellPaths.h} |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)
 rename ApplicationCode/Commands/WellPathCommands/{RicWellPathsImportFileFeature.cpp => RicImportWellPaths.cpp} (89%)
 rename ApplicationCode/Commands/WellPathCommands/{RicWellPathsImportFileFeature.h => RicImportWellPaths.h} (96%)

diff --git a/ApplicationCode/CommandFileInterface/RicfImportWellPaths.cpp b/ApplicationCode/CommandFileInterface/RicfImportWellPaths.cpp
index 0afc1b68d1..85ad09828b 100644
--- a/ApplicationCode/CommandFileInterface/RicfImportWellPaths.cpp
+++ b/ApplicationCode/CommandFileInterface/RicfImportWellPaths.cpp
@@ -17,7 +17,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 #include "RicfImportWellPaths.h"
 
-#include "WellPathCommands/RicWellPathsImportFileFeature.h"
+#include "WellPathCommands/RicImportWellPaths.h"
 
 #include "RimFileWellPath.h"
 
@@ -57,7 +57,7 @@ RicfCommandResponse RicfImportWellPaths::execute()
     if ( wellPathFolder.exists() )
     {
         QStringList nameFilters;
-        nameFilters << RicWellPathsImportFileFeature::wellPathNameFilters();
+        nameFilters << RicImportWellPaths::wellPathNameFilters();
         QStringList relativePaths = wellPathFolder.entryList( nameFilters, QDir::Files | QDir::NoDotAndDotDot );
         for ( QString relativePath : relativePaths )
         {
@@ -84,8 +84,8 @@ RicfCommandResponse RicfImportWellPaths::execute()
     RicfCommandResponse response;
     if ( !wellPathFiles.empty() )
     {
-        std::vector<RimFileWellPath*> importedWellPaths = RicWellPathsImportFileFeature::importWellPaths( wellPathFiles,
-                                                                                                          &warningMessages );
+        std::vector<RimFileWellPath*> importedWellPaths = RicImportWellPaths::importWellPaths( wellPathFiles,
+                                                                                               &warningMessages );
         if ( !importedWellPaths.empty() )
         {
             RicfImportWellPathsResult* wellPathsResult = new RicfImportWellPathsResult;
diff --git a/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake
index 4032ae68a8..f1945daed4 100644
--- a/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake
+++ b/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake
@@ -13,7 +13,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicWellPathsUnitSystemSettingsUi.h
 ${CMAKE_CURRENT_LIST_DIR}/RicWellPathPickEventHandler.h 
 ${CMAKE_CURRENT_LIST_DIR}/RicCreateWellTargetsPickEventHandler.h
 ${CMAKE_CURRENT_LIST_DIR}/RicIntersectionPickEventHandler.h
-${CMAKE_CURRENT_LIST_DIR}/RicWellPathFormationsImportFileFeature.h
+${CMAKE_CURRENT_LIST_DIR}/RicImportWellPaths.h
 ${CMAKE_CURRENT_LIST_DIR}/RicPolylineTargetsPickEventHandler.h
 ${CMAKE_CURRENT_LIST_DIR}/RicNewPolylineTargetFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicDeletePolylineTargetFeature.h
@@ -27,7 +27,7 @@ ${CMAKE_CURRENT_LIST_DIR}/PointTangentManipulator/RicPolylineTarget3dEditor.h
 
 set (SOURCE_GROUP_SOURCE_FILES
 ${CMAKE_CURRENT_LIST_DIR}/RicWellPathDeleteFeature.cpp
-${CMAKE_CURRENT_LIST_DIR}/RicWellPathsImportFileFeature.cpp
+${CMAKE_CURRENT_LIST_DIR}/RicImportWellPaths.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicNewEditableWellPathFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicShowWellPlanFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathListTargetFeature.cpp
diff --git a/ApplicationCode/Commands/WellPathCommands/RicWellPathsImportFileFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.cpp
similarity index 89%
rename from ApplicationCode/Commands/WellPathCommands/RicWellPathsImportFileFeature.cpp
rename to ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.cpp
index 9c2fe43d86..84d04062bc 100644
--- a/ApplicationCode/Commands/WellPathCommands/RicWellPathsImportFileFeature.cpp
+++ b/ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.cpp
@@ -17,7 +17,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicWellPathsImportFileFeature.h"
+#include "RicImportWellPaths.h"
 
 #include "RiaApplication.h"
 #include "RiaGuiApplication.h"
@@ -34,13 +34,13 @@
 #include <QFileDialog>
 #include <QMessageBox>
 
-CAF_CMD_SOURCE_INIT( RicWellPathsImportFileFeature, "RicWellPathsImportFileFeature" );
+CAF_CMD_SOURCE_INIT( RicImportWellPaths, "RicWellPathsImportFileFeature" );
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::vector<RimFileWellPath*> RicWellPathsImportFileFeature::importWellPaths( const QStringList& wellPathFilePaths,
-                                                                              QStringList*       errorMessages )
+std::vector<RimFileWellPath*> RicImportWellPaths::importWellPaths( const QStringList& wellPathFilePaths,
+                                                                   QStringList*       errorMessages )
 {
     RiaApplication* app = RiaApplication::instance();
 
@@ -71,7 +71,7 @@ std::vector<RimFileWellPath*> RicWellPathsImportFileFeature::importWellPaths( co
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QStringList RicWellPathsImportFileFeature::wellPathNameFilters()
+QStringList RicImportWellPaths::wellPathNameFilters()
 {
     QStringList nameFilters;
     nameFilters << "*.json"
@@ -85,7 +85,7 @@ QStringList RicWellPathsImportFileFeature::wellPathNameFilters()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-bool RicWellPathsImportFileFeature::isCommandEnabled()
+bool RicImportWellPaths::isCommandEnabled()
 {
     return true;
 }
@@ -93,7 +93,7 @@ bool RicWellPathsImportFileFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RicWellPathsImportFileFeature::onActionTriggered( bool isChecked )
+void RicImportWellPaths::onActionTriggered( bool isChecked )
 {
     // Open dialog box to select well path files
     RiaApplication* app                = RiaApplication::instance();
@@ -128,7 +128,7 @@ void RicWellPathsImportFileFeature::onActionTriggered( bool isChecked )
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RicWellPathsImportFileFeature::setupActionLook( QAction* actionToSetup )
+void RicImportWellPaths::setupActionLook( QAction* actionToSetup )
 {
     actionToSetup->setText( "Import &Well Paths from File" );
     actionToSetup->setIcon( QIcon( ":/Well.png" ) );
diff --git a/ApplicationCode/Commands/WellPathCommands/RicWellPathsImportFileFeature.h b/ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.h
similarity index 96%
rename from ApplicationCode/Commands/WellPathCommands/RicWellPathsImportFileFeature.h
rename to ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.h
index 9cf74c4ce1..ba7c024d27 100644
--- a/ApplicationCode/Commands/WellPathCommands/RicWellPathsImportFileFeature.h
+++ b/ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.h
@@ -28,7 +28,7 @@ class RimFileWellPath;
 //==================================================================================================
 ///
 //==================================================================================================
-class RicWellPathsImportFileFeature : public caf::CmdFeature
+class RicImportWellPaths : public caf::CmdFeature
 {
     CAF_CMD_HEADER_INIT;