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

(#357) Renamed PdmUiObjectHandle::owner() to objectHandle()

Browse Source
This commit is contained in:
Jacob Støren 2015-08-14 16:15:49 +02:00
parent f3810640ca
commit 5cd416ce6b
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@ -460,7 +460,7 @@ void RivFaultPartMgr::createLabelWithAnchorLine(const cvf::Part* part)
RimFault* noConstRimFault = const_cast<RimFault*>(m_rimFault); RimFault* noConstRimFault = const_cast<RimFault*>(m_rimFault);
if (noConstRimFault) if (noConstRimFault)
{ {
RimFaultCollection* parentObject = dynamic_cast<RimFaultCollection*>(noConstRimFault->owner()); RimFaultCollection* parentObject = dynamic_cast<RimFaultCollection*>(noConstRimFault->objectHandle());
if (parentObject) if (parentObject)
{ {
defWellLabelColor = parentObject->faultLabelColor();; defWellLabelColor = parentObject->faultLabelColor();;

2
Fwk/AppFwk/cafCommand/defaultfeatures/cafCmdDeleteItemFeature.cpp
View File

@ -69,7 +69,7 @@ CmdExecuteCommand* CmdDeleteItemFeature::createExecuteCommand()
{ {
if (dynamic_cast<caf::PdmUiObjectHandle*>(items[i])) if (dynamic_cast<caf::PdmUiObjectHandle*>(items[i]))
{ {
currentPdmObject = dynamic_cast<caf::PdmUiObjectHandle*>(items[i])->owner(); currentPdmObject = dynamic_cast<caf::PdmUiObjectHandle*>(items[i])->objectHandle();
} }
} }

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectEditorHandle.cpp
View File

@ -75,7 +75,7 @@ PdmObjectHandle* PdmUiObjectEditorHandle::pdmObject()
PdmUiObjectHandle* uiObject = dynamic_cast<PdmUiObjectHandle*>(pdmItem()); PdmUiObjectHandle* uiObject = dynamic_cast<PdmUiObjectHandle*>(pdmItem());
if (uiObject) if (uiObject)
{ {
return uiObject->owner(); return uiObject->objectHandle();
} }
else else
{ {

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.h
View File

@ -20,7 +20,7 @@ public:
PdmUiObjectHandle(PdmObjectHandle* owner, bool giveOwnership); PdmUiObjectHandle(PdmObjectHandle* owner, bool giveOwnership);
virtual ~PdmUiObjectHandle() { } virtual ~PdmUiObjectHandle() { }
PdmObjectHandle* owner() { return m_owner; } PdmObjectHandle* objectHandle() { return m_owner; }
/// Method to be called from the Ui classes creating Auto Gui to get the group information /// Method to be called from the Ui classes creating Auto Gui to get the group information
/// supplied by the \sa defineUiOrdering method that can be reimplemented /// supplied by the \sa defineUiOrdering method that can be reimplemented

4
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafSelectionManager.cpp
View File

@ -96,7 +96,7 @@ void SelectionManager::setSelectedItems(const std::vector<PdmUiItem*>& items, in
PdmUiObjectHandle* obj = dynamic_cast<PdmUiObjectHandle*>(items[i]); PdmUiObjectHandle* obj = dynamic_cast<PdmUiObjectHandle*>(items[i]);
if (obj) if (obj)
{ {
selection.push_back(std::make_pair(obj->owner(), obj)); selection.push_back(std::make_pair(obj->objectHandle(), obj));
} }
} }
} }
@ -159,7 +159,7 @@ void SelectionManager::selectionAsReferences(std::vector<QString>& referenceList
PdmUiObjectHandle* pdmObj = dynamic_cast<PdmUiObjectHandle*>(selection[i].second); PdmUiObjectHandle* pdmObj = dynamic_cast<PdmUiObjectHandle*>(selection[i].second);
if (pdmObj) if (pdmObj)
{ {
QString itemRef = PdmReferenceHelper::referenceFromRootToObject(m_rootObject, pdmObj->owner()); QString itemRef = PdmReferenceHelper::referenceFromRootToObject(m_rootObject, pdmObj->objectHandle());
referenceList.push_back(itemRef); referenceList.push_back(itemRef);
} }

2
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewModel.cpp
View File

@ -147,7 +147,7 @@ void PdmUiTreeViewModel::updateSubTree(PdmUiItem* pdmRoot)
PdmUiObjectHandle* obj = dynamic_cast<PdmUiObjectHandle*> (pdmRoot); PdmUiObjectHandle* obj = dynamic_cast<PdmUiObjectHandle*> (pdmRoot);
if (obj) if (obj)
{ {
newTreeRootTmp = new PdmUiTreeOrdering(obj->owner()); newTreeRootTmp = new PdmUiTreeOrdering(obj->objectHandle());
} }
} }