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 of missing changes from previous merge commits. Missing rename of anchestor to ancestor

Browse Source
This commit is contained in:
Jacob Støren
2016-09-28 14:35:57 +02:00
parent cbb626aa31
commit 3bca03a722
10 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimIntersectionBox.cpp
View File

@@ -329,7 +329,7 @@ void RimIntersectionBox::rebuildGeometryAndScheduleCreateDisplayModel()
m_intersectionBoxPartMgr = nullptr;
RimView* rimView = NULL;
this->firstAnchestorOrThisOfType(rimView);
this->firstAncestorOrThisOfType(rimView);
if (rimView)
{
rimView->scheduleCreateDisplayModelAndRedraw();
@@ -384,12 +384,12 @@ void RimIntersectionBox::clampSinglePlaneValues()
cvf::BoundingBox RimIntersectionBox::currentCellBoundingBox()
{
RimCase* rimCase = NULL;
this->firstAnchestorOrThisOfType(rimCase);
this->firstAncestorOrThisOfType(rimCase);
CVF_ASSERT(rimCase);
RimEclipseView* eclView = nullptr;
this->firstAnchestorOrThisOfType(eclView);
this->firstAncestorOrThisOfType(eclView);
bool useAllCells = true;
if (eclView)

2
ApplicationCode/ProjectDataModel/RimIntersectionBoxCollection.cpp
View File

@@ -129,7 +129,7 @@ void RimIntersectionBoxCollection::fieldChangedByUi(const caf::PdmFieldHandle* c
if (changedField == &isActive)
{
RimView* rimView = NULL;
firstAnchestorOrThisOfType(rimView);
firstAncestorOrThisOfType(rimView);
if (rimView)
{
rimView->scheduleCreateDisplayModelAndRedraw();

2
ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp
View File

@@ -109,7 +109,7 @@ void RimMainPlotCollection::showPlotWindow()
dockWidget->setWidget(projPropView);
RimProject* proj = NULL;
this->firstAnchestorOrThisOfType(proj);
this->firstAncestorOrThisOfType(proj);
projPropView->setPdmItem(this);