From 7ebe9b17b980bc286b96e2d5951b50ada476d640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Thu, 7 Aug 2014 14:20:20 +0200 Subject: [PATCH] Renamed files to reflect new classnames --- .../RivReservoirViewPartMgr.cpp | 2 +- .../ReservoirDataModel/CMakeLists_files.cmake | 24 +++++++++---------- ...t.cpp => RigActiveCellsResultAccessor.cpp} | 2 +- ...bject.h => RigActiveCellsResultAccessor.h} | 2 +- ....cpp => RigAllGridCellsResultAccessor.cpp} | 2 +- ...ject.h => RigAllGridCellsResultAccessor.h} | 2 +- .../ReservoirDataModel/RigCaseData.cpp | 2 +- ...ject.cpp => RigCellEdgeResultAccessor.cpp} | 2 +- ...ssObject.h => RigCellEdgeResultAccessor.h} | 2 +- ...ect.cpp => RigCombTransResultAccessor.cpp} | 2 +- ...sObject.h => RigCombTransResultAccessor.h} | 2 +- .../ReservoirDataModel/RigGridBase.cpp | 2 +- ...AccessObject.cpp => RigResultAccessor.cpp} | 2 +- ...sultAccessObject.h => RigResultAccessor.h} | 0 ...ctory.cpp => RigResultAccessorFactory.cpp} | 10 ++++---- ...ctFactory.h => RigResultAccessorFactory.h} | 0 16 files changed, 29 insertions(+), 29 deletions(-) rename ApplicationCode/ReservoirDataModel/{RigActiveCellsResultAccessObject.cpp => RigActiveCellsResultAccessor.cpp} (98%) rename ApplicationCode/ReservoirDataModel/{RigActiveCellsResultAccessObject.h => RigActiveCellsResultAccessor.h} (98%) rename ApplicationCode/ReservoirDataModel/{RigAllGridCellsResultAccessObject.cpp => RigAllGridCellsResultAccessor.cpp} (98%) rename ApplicationCode/ReservoirDataModel/{RigAllGridCellsResultAccessObject.h => RigAllGridCellsResultAccessor.h} (97%) rename ApplicationCode/ReservoirDataModel/{RigCellFaceResultAccessObject.cpp => RigCellEdgeResultAccessor.cpp} (98%) rename ApplicationCode/ReservoirDataModel/{RigCellFaceResultAccessObject.h => RigCellEdgeResultAccessor.h} (97%) rename ApplicationCode/ReservoirDataModel/{RigCombTransResultAccessObject.cpp => RigCombTransResultAccessor.cpp} (99%) rename ApplicationCode/ReservoirDataModel/{RigCombTransResultAccessObject.h => RigCombTransResultAccessor.h} (98%) rename ApplicationCode/ReservoirDataModel/{RigResultAccessObject.cpp => RigResultAccessor.cpp} (95%) rename ApplicationCode/ReservoirDataModel/{RigResultAccessObject.h => RigResultAccessor.h} (100%) rename ApplicationCode/ReservoirDataModel/{RigResultAccessObjectFactory.cpp => RigResultAccessorFactory.cpp} (98%) rename ApplicationCode/ReservoirDataModel/{RigResultAccessObjectFactory.h => RigResultAccessorFactory.h} (100%) diff --git a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp index 284985349c..abc229ffa0 100644 --- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp @@ -23,7 +23,7 @@ #include "RigCaseData.h" #include "RigGridBase.h" #include "RigCaseCellResultsData.h" -#include "RigResultAccessObjectFactory.h" +#include "RigResultAccessorFactory.h" #include "RimCase.h" #include "RimCellRangeFilterCollection.h" #include "RimWellCollection.h" diff --git a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake index 123e156828..53420405e8 100644 --- a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake @@ -10,12 +10,12 @@ ${CEE_CURRENT_LIST_DIR}RigCell.h ${CEE_CURRENT_LIST_DIR}RigCaseData.h ${CEE_CURRENT_LIST_DIR}RigGridBase.h ${CEE_CURRENT_LIST_DIR}RigGridManager.h -${CEE_CURRENT_LIST_DIR}RigResultAccessObject.h -${CEE_CURRENT_LIST_DIR}RigResultAccessObjectFactory.h -${CEE_CURRENT_LIST_DIR}RigAllGridCellsResultAccessObject.h -${CEE_CURRENT_LIST_DIR}RigActiveCellsResultAccessObject.h -${CEE_CURRENT_LIST_DIR}RigCellFaceResultAccessObject.h -${CEE_CURRENT_LIST_DIR}RigCombTransResultAccessObject.h +${CEE_CURRENT_LIST_DIR}RigResultAccessor.h +${CEE_CURRENT_LIST_DIR}RigResultAccessorFactory.h +${CEE_CURRENT_LIST_DIR}RigAllGridCellsResultAccessor.h +${CEE_CURRENT_LIST_DIR}RigActiveCellsResultAccessor.h +${CEE_CURRENT_LIST_DIR}RigCellEdgeResultAccessor.h +${CEE_CURRENT_LIST_DIR}RigCombTransResultAccessor.h ${CEE_CURRENT_LIST_DIR}RigLocalGrid.h ${CEE_CURRENT_LIST_DIR}RigMainGrid.h ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.h @@ -35,12 +35,12 @@ ${CEE_CURRENT_LIST_DIR}RigCell.cpp ${CEE_CURRENT_LIST_DIR}RigCaseData.cpp ${CEE_CURRENT_LIST_DIR}RigGridBase.cpp ${CEE_CURRENT_LIST_DIR}RigGridManager.cpp -${CEE_CURRENT_LIST_DIR}RigResultAccessObject.cpp -${CEE_CURRENT_LIST_DIR}RigResultAccessObjectFactory.cpp -${CEE_CURRENT_LIST_DIR}RigAllGridCellsResultAccessObject.cpp -${CEE_CURRENT_LIST_DIR}RigActiveCellsResultAccessObject.cpp -${CEE_CURRENT_LIST_DIR}RigCellFaceResultAccessObject.cpp -${CEE_CURRENT_LIST_DIR}RigCombTransResultAccessObject.cpp +${CEE_CURRENT_LIST_DIR}RigResultAccessor.cpp +${CEE_CURRENT_LIST_DIR}RigResultAccessorFactory.cpp +${CEE_CURRENT_LIST_DIR}RigAllGridCellsResultAccessor.cpp +${CEE_CURRENT_LIST_DIR}RigActiveCellsResultAccessor.cpp +${CEE_CURRENT_LIST_DIR}RigCellEdgeResultAccessor.cpp +${CEE_CURRENT_LIST_DIR}RigCombTransResultAccessor.cpp ${CEE_CURRENT_LIST_DIR}RigLocalGrid.cpp ${CEE_CURRENT_LIST_DIR}RigMainGrid.cpp ${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.cpp diff --git a/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.cpp b/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.cpp similarity index 98% rename from ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.cpp rename to ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.cpp index 643d834575..edd5ae168c 100644 --- a/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.cpp +++ b/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RigActiveCellsResultAccessObject.h" +#include "RigActiveCellsResultAccessor.h" #include "RigGridBase.h" #include "RigActiveCellInfo.h" diff --git a/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.h b/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.h similarity index 98% rename from ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.h rename to ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.h index 47f640a17d..306b70fcda 100644 --- a/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessObject.h +++ b/ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.h @@ -18,7 +18,7 @@ #pragma once -#include "RigResultAccessObject.h" +#include "RigResultAccessor.h" class RigGridBase; class RigActiveCellInfo; diff --git a/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessObject.cpp b/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp similarity index 98% rename from ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessObject.cpp rename to ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp index 8e240d2f09..7e5762a184 100644 --- a/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessObject.cpp +++ b/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RigAllGridCellsResultAccessObject.h" +#include "RigAllGridCellsResultAccessor.h" #include "RigGridBase.h" diff --git a/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessObject.h b/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.h similarity index 97% rename from ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessObject.h rename to ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.h index 2af694fa50..1c4473daa0 100644 --- a/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessObject.h +++ b/ApplicationCode/ReservoirDataModel/RigAllGridCellsResultAccessor.h @@ -18,7 +18,7 @@ #pragma once -#include "RigActiveCellsResultAccessObject.h" +#include "RigActiveCellsResultAccessor.h" class RigGridBase; diff --git a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp b/ApplicationCode/ReservoirDataModel/RigCaseData.cpp index 1b2d8b18bc..8a9192f107 100644 --- a/ApplicationCode/ReservoirDataModel/RigCaseData.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCaseData.cpp @@ -19,7 +19,7 @@ #include "RigCaseData.h" #include "RigMainGrid.h" #include "RigCaseCellResultsData.h" -#include "RigResultAccessObjectFactory.h" +#include "RigResultAccessorFactory.h" //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.cpp b/ApplicationCode/ReservoirDataModel/RigCellEdgeResultAccessor.cpp similarity index 98% rename from ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.cpp rename to ApplicationCode/ReservoirDataModel/RigCellEdgeResultAccessor.cpp index eabe99cb33..a5dfc0ee28 100644 --- a/ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCellEdgeResultAccessor.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RigCellFaceResultAccessObject.h" +#include "RigCellEdgeResultAccessor.h" #include diff --git a/ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.h b/ApplicationCode/ReservoirDataModel/RigCellEdgeResultAccessor.h similarity index 97% rename from ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.h rename to ApplicationCode/ReservoirDataModel/RigCellEdgeResultAccessor.h index 7d0ead9536..73ea161fb8 100644 --- a/ApplicationCode/ReservoirDataModel/RigCellFaceResultAccessObject.h +++ b/ApplicationCode/ReservoirDataModel/RigCellEdgeResultAccessor.h @@ -18,7 +18,7 @@ #pragma once -#include "RigResultAccessObject.h" +#include "RigResultAccessor.h" #include "cvfCollection.h" diff --git a/ApplicationCode/ReservoirDataModel/RigCombTransResultAccessObject.cpp b/ApplicationCode/ReservoirDataModel/RigCombTransResultAccessor.cpp similarity index 99% rename from ApplicationCode/ReservoirDataModel/RigCombTransResultAccessObject.cpp rename to ApplicationCode/ReservoirDataModel/RigCombTransResultAccessor.cpp index 6e651c55f2..86a27788b2 100644 --- a/ApplicationCode/ReservoirDataModel/RigCombTransResultAccessObject.cpp +++ b/ApplicationCode/ReservoirDataModel/RigCombTransResultAccessor.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RigCombTransResultAccessObject.h" +#include "RigCombTransResultAccessor.h" #include "RigGridBase.h" diff --git a/ApplicationCode/ReservoirDataModel/RigCombTransResultAccessObject.h b/ApplicationCode/ReservoirDataModel/RigCombTransResultAccessor.h similarity index 98% rename from ApplicationCode/ReservoirDataModel/RigCombTransResultAccessObject.h rename to ApplicationCode/ReservoirDataModel/RigCombTransResultAccessor.h index 5830f410ad..e99002d799 100644 --- a/ApplicationCode/ReservoirDataModel/RigCombTransResultAccessObject.h +++ b/ApplicationCode/ReservoirDataModel/RigCombTransResultAccessor.h @@ -18,7 +18,7 @@ #pragma once -#include "RigResultAccessObject.h" +#include "RigResultAccessor.h" #include "cvfCollection.h" diff --git a/ApplicationCode/ReservoirDataModel/RigGridBase.cpp b/ApplicationCode/ReservoirDataModel/RigGridBase.cpp index 4c195270da..1342059660 100644 --- a/ApplicationCode/ReservoirDataModel/RigGridBase.cpp +++ b/ApplicationCode/ReservoirDataModel/RigGridBase.cpp @@ -20,7 +20,7 @@ #include "RigMainGrid.h" #include "RigCell.h" #include "RigCaseCellResultsData.h" -#include "RigResultAccessObjectFactory.h" +#include "RigResultAccessorFactory.h" #include "cvfAssert.h" diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessObject.cpp b/ApplicationCode/ReservoirDataModel/RigResultAccessor.cpp similarity index 95% rename from ApplicationCode/ReservoirDataModel/RigResultAccessObject.cpp rename to ApplicationCode/ReservoirDataModel/RigResultAccessor.cpp index 6d732c7309..160c2b9abe 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultAccessObject.cpp +++ b/ApplicationCode/ReservoirDataModel/RigResultAccessor.cpp @@ -16,4 +16,4 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RigResultAccessObject.h" +#include "RigResultAccessor.h" diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessObject.h b/ApplicationCode/ReservoirDataModel/RigResultAccessor.h similarity index 100% rename from ApplicationCode/ReservoirDataModel/RigResultAccessObject.h rename to ApplicationCode/ReservoirDataModel/RigResultAccessor.h diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp similarity index 98% rename from ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp rename to ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp index dccfd0fed9..0e6fba79b9 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp +++ b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp @@ -16,11 +16,11 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RigResultAccessObjectFactory.h" +#include "RigResultAccessorFactory.h" -#include "RigResultAccessObject.h" -#include "RigActiveCellsResultAccessObject.h" -#include "RigAllGridCellsResultAccessObject.h" +#include "RigResultAccessor.h" +#include "RigActiveCellsResultAccessor.h" +#include "RigAllGridCellsResultAccessor.h" #include "cvfLibCore.h" #include "cvfBase.h" @@ -33,7 +33,7 @@ #include "RigGridBase.h" #include "RigCaseData.h" #include -#include "RigCombTransResultAccessObject.h" +#include "RigCombTransResultAccessor.h" //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.h b/ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h similarity index 100% rename from ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.h rename to ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.h