diff --git a/ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.cpp b/ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.cpp index ed887bc262..7ca78f1d48 100644 --- a/ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.cpp +++ b/ApplicationCode/Commands/IntersectionBoxCommands/RicAppendIntersectionBoxFeature.cpp @@ -64,7 +64,7 @@ void RicAppendIntersectionBoxFeature::onActionTriggered(bool isChecked) RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox); RimView* rimView = NULL; - coll->firstAnchestorOrThisOfType(rimView); + coll->firstAncestorOrThisOfType(rimView); if (rimView) { rimView->showGridCells(false); @@ -93,7 +93,7 @@ RimIntersectionBoxCollection* RicAppendIntersectionBoxFeature::intersectionBoxCo caf::SelectionManager::instance()->objectsByType(&selectedObjects); if (selectedObjects.size() == 1) { - selectedObjects[0]->firstAnchestorOrThisOfType(intersectionBoxColl); + selectedObjects[0]->firstAncestorOrThisOfType(intersectionBoxColl); } return intersectionBoxColl; diff --git a/ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxXSliceFeature.cpp b/ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxXSliceFeature.cpp index 67d0b08515..ac2b9228e1 100644 --- a/ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxXSliceFeature.cpp +++ b/ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxXSliceFeature.cpp @@ -68,7 +68,7 @@ void RicIntersectionBoxXSliceFeature::onActionTriggered(bool isChecked) RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox); RimView* rimView = NULL; - coll->firstAnchestorOrThisOfType(rimView); + coll->firstAncestorOrThisOfType(rimView); if (rimView) { rimView->showGridCells(false); diff --git a/ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxYSliceFeature.cpp b/ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxYSliceFeature.cpp index e47c499aea..52541e5cbb 100644 --- a/ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxYSliceFeature.cpp +++ b/ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxYSliceFeature.cpp @@ -68,7 +68,7 @@ void RicIntersectionBoxYSliceFeature::onActionTriggered(bool isChecked) RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox); RimView* rimView = NULL; - coll->firstAnchestorOrThisOfType(rimView); + coll->firstAncestorOrThisOfType(rimView); if (rimView) { rimView->showGridCells(false); diff --git a/ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxZSliceFeature.cpp b/ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxZSliceFeature.cpp index 4e5979c8a6..4f048d74ae 100644 --- a/ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxZSliceFeature.cpp +++ b/ApplicationCode/Commands/IntersectionBoxCommands/RicIntersectionBoxZSliceFeature.cpp @@ -67,7 +67,7 @@ void RicIntersectionBoxZSliceFeature::onActionTriggered(bool isChecked) RiuMainWindow::instance()->selectAsCurrentItem(intersectionBox); RimView* rimView = NULL; - coll->firstAnchestorOrThisOfType(rimView); + coll->firstAncestorOrThisOfType(rimView); if (rimView) { rimView->showGridCells(false); diff --git a/ApplicationCode/Commands/RicDeleteItemExec.cpp b/ApplicationCode/Commands/RicDeleteItemExec.cpp index 3af56e5c94..203b1bffab 100644 --- a/ApplicationCode/Commands/RicDeleteItemExec.cpp +++ b/ApplicationCode/Commands/RicDeleteItemExec.cpp @@ -112,7 +112,7 @@ void RicDeleteItemExec::redo() } RimIntersectionBoxCollection* intersectionBoxColl; - parentObj->firstAnchestorOrThisOfType(intersectionBoxColl); + parentObj->firstAncestorOrThisOfType(intersectionBoxColl); if (view && intersectionBoxColl) { view->scheduleCreateDisplayModelAndRedraw(); diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp index 28c06e469f..26bdeb972f 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionBoxPartMgr.cpp @@ -85,7 +85,7 @@ void RivIntersectionBoxPartMgr::updateCellResultColor(size_t timeStepIndex) if (!m_intersectionBoxGenerator->isAnyGeometryPresent()) return; RimEclipseView* eclipseView; - m_rimIntersectionBox->firstAnchestorOrThisOfType(eclipseView); + m_rimIntersectionBox->firstAncestorOrThisOfType(eclipseView); if (eclipseView) { @@ -148,7 +148,7 @@ void RivIntersectionBoxPartMgr::updateCellResultColor(size_t timeStepIndex) } RimGeoMechView* geoView; - m_rimIntersectionBox->firstAnchestorOrThisOfType(geoView); + m_rimIntersectionBox->firstAncestorOrThisOfType(geoView); if (geoView) { @@ -405,7 +405,7 @@ cvf::ref RivIntersectionBoxPartMgr::createHexGr { RimEclipseView* eclipseView; - m_rimIntersectionBox->firstAnchestorOrThisOfType(eclipseView); + m_rimIntersectionBox->firstAncestorOrThisOfType(eclipseView); if (eclipseView) { RigMainGrid* grid = NULL; @@ -416,7 +416,7 @@ cvf::ref RivIntersectionBoxPartMgr::createHexGr } RimGeoMechView* geoView; - m_rimIntersectionBox->firstAnchestorOrThisOfType(geoView); + m_rimIntersectionBox->firstAncestorOrThisOfType(geoView); if (geoView) { RigFemPart* femPart = geoView->geoMechCase()->geoMechData()->femParts()->part(0); diff --git a/ApplicationCode/ProjectDataModel/RimIntersectionBox.cpp b/ApplicationCode/ProjectDataModel/RimIntersectionBox.cpp index 4a8cbc25ca..7978de2b5d 100644 --- a/ApplicationCode/ProjectDataModel/RimIntersectionBox.cpp +++ b/ApplicationCode/ProjectDataModel/RimIntersectionBox.cpp @@ -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) diff --git a/ApplicationCode/ProjectDataModel/RimIntersectionBoxCollection.cpp b/ApplicationCode/ProjectDataModel/RimIntersectionBoxCollection.cpp index 73ddd7fc86..8b38daf16e 100644 --- a/ApplicationCode/ProjectDataModel/RimIntersectionBoxCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimIntersectionBoxCollection.cpp @@ -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(); diff --git a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp index f963eca233..d778da5ccf 100644 --- a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp @@ -109,7 +109,7 @@ void RimMainPlotCollection::showPlotWindow() dockWidget->setWidget(projPropView); RimProject* proj = NULL; - this->firstAnchestorOrThisOfType(proj); + this->firstAncestorOrThisOfType(proj); projPropView->setPdmItem(this); diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp index d4a38d4187..0b0a26a855 100644 --- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp +++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp @@ -158,7 +158,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event) CVF_ASSERT(activeView); RimCase* rimCase = NULL; - activeView->firstAnchestorOrThisOfType(rimCase); + activeView->firstAncestorOrThisOfType(rimCase); if (rimCase) { displayModelOffset = rimCase->displayModelOffset();