OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix casing issue which resulted in build error on Linux

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-06-28 09:00:34 +02:00
parent dde88a010e
commit c89da0e9d5
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathTargetFeature.cpp
View File

@@ -21,7 +21,7 @@ CAF_CMD_SOURCE_INIT(RicDeleteWellPathTargetFeature, "RicDeleteWellPathTargetFeat
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include "RimWellPathTarget.h" #include "RimWellPathTarget.h"
#include "RimModeledWellpath.h" #include "RimModeledWellPath.h"
#include <QAction> #include <QAction>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/Commands/WellPathCommands/RicNewEditableWellPathFeature.cpp
View File

@@ -67,7 +67,7 @@ void RicNewEditableWellPathFeature::onActionTriggered(bool isChecked)
if ( wellPathCollection ) if ( wellPathCollection )
{ {
std::vector<RimWellPath*> newWellPaths; std::vector<RimWellPath*> newWellPaths;
newWellPaths.push_back(new RimModeledWellpath()); newWellPaths.push_back(new RimModeledWellPath());
wellPathCollection->addWellPaths(newWellPaths); wellPathCollection->addWellPaths(newWellPaths);
wellPathCollection->uiCapability()->updateConnectedEditors(); wellPathCollection->uiCapability()->updateConnectedEditors();
wellPathCollection->scheduleRedrawAffectedViews(); wellPathCollection->scheduleRedrawAffectedViews();

2
ApplicationCode/Commands/WellPathCommands/RicNewWellPathListTargetFeature.cpp
View File

@@ -21,7 +21,7 @@ CAF_CMD_SOURCE_INIT(RicNewWellPathListTargetFeature, "RicNewWellPathListTargetFe
#include "cafSelectionManager.h" #include "cafSelectionManager.h"
#include "RimWellPathTarget.h" #include "RimWellPathTarget.h"
#include "RimModeledWellpath.h" #include "RimModeledWellPath.h"
#include <QAction> #include <QAction>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@@ -25,7 +25,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimSimWellInView.h
${CMAKE_CURRENT_LIST_DIR}/RimSimWellInViewCollection.h ${CMAKE_CURRENT_LIST_DIR}/RimSimWellInViewCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimWellPath.h ${CMAKE_CURRENT_LIST_DIR}/RimWellPath.h
${CMAKE_CURRENT_LIST_DIR}/RimFileWellPath.h ${CMAKE_CURRENT_LIST_DIR}/RimFileWellPath.h
${CMAKE_CURRENT_LIST_DIR}/RimModeledWellpath.h ${CMAKE_CURRENT_LIST_DIR}/RimModeledWellPath.h
${CMAKE_CURRENT_LIST_DIR}/RimWellPathCollection.h ${CMAKE_CURRENT_LIST_DIR}/RimWellPathCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimWellPathTarget.h ${CMAKE_CURRENT_LIST_DIR}/RimWellPathTarget.h
${CMAKE_CURRENT_LIST_DIR}/RimScriptCollection.h ${CMAKE_CURRENT_LIST_DIR}/RimScriptCollection.h
@@ -137,7 +137,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimSimWellInView.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSimWellInViewCollection.cpp ${CMAKE_CURRENT_LIST_DIR}/RimSimWellInViewCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimWellPath.cpp ${CMAKE_CURRENT_LIST_DIR}/RimWellPath.cpp
${CMAKE_CURRENT_LIST_DIR}/RimFileWellPath.cpp ${CMAKE_CURRENT_LIST_DIR}/RimFileWellPath.cpp
${CMAKE_CURRENT_LIST_DIR}/RimModeledWellpath.cpp ${CMAKE_CURRENT_LIST_DIR}/RimModeledWellPath.cpp
${CMAKE_CURRENT_LIST_DIR}/RimWellPathCollection.cpp ${CMAKE_CURRENT_LIST_DIR}/RimWellPathCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimWellPathTarget.cpp ${CMAKE_CURRENT_LIST_DIR}/RimWellPathTarget.cpp
${CMAKE_CURRENT_LIST_DIR}/RimScriptCollection.cpp ${CMAKE_CURRENT_LIST_DIR}/RimScriptCollection.cpp

8
ApplicationCode/ProjectDataModel/RimModeledWellPath.cpp
View File

@@ -4,12 +4,12 @@
#include "cafPdmUiTreeOrdering.h" #include "cafPdmUiTreeOrdering.h"
#include "cafCmdFeatureMenuBuilder.h" #include "cafCmdFeatureMenuBuilder.h"
CAF_PDM_SOURCE_INIT(RimModeledWellpath, "ModeledWellpath"); CAF_PDM_SOURCE_INIT(RimModeledWellPath, "ModeledWellPath");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimModeledWellpath::RimModeledWellpath() RimModeledWellPath::RimModeledWellPath()
{ {
CAF_PDM_InitObject("Modeled WellPath", ":/Well.png", "", ""); CAF_PDM_InitObject("Modeled WellPath", ":/Well.png", "", "");
@@ -21,7 +21,7 @@ RimModeledWellpath::RimModeledWellpath()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimModeledWellpath::~RimModeledWellpath() RimModeledWellPath::~RimModeledWellPath()
{ {
} }
@@ -30,7 +30,7 @@ RimModeledWellpath::~RimModeledWellpath()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimModeledWellpath::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) void RimModeledWellPath::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName)
{ {
uiTreeOrdering.add(m_geometryDefinition()); uiTreeOrdering.add(m_geometryDefinition());
RimWellPath::defineUiTreeOrdering(uiTreeOrdering, uiConfigName); RimWellPath::defineUiTreeOrdering(uiTreeOrdering, uiConfigName);

6
ApplicationCode/ProjectDataModel/RimModeledWellPath.h
View File

@@ -29,13 +29,13 @@ class RimWellPathTarget;
class RimWellPath; class RimWellPath;
class RimWellPathGeometryDef; class RimWellPathGeometryDef;
class RimModeledWellpath: public RimWellPath class RimModeledWellPath: public RimWellPath
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimModeledWellpath(); RimModeledWellPath();
~RimModeledWellpath(); ~RimModeledWellPath();
private: private: