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

System : Rename

Browse Source
This commit is contained in:
Magne Sjaastad 2018-09-24 22:25:46 +02:00
parent dc9edccb54
commit 10ef3fcd4d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimCommandObject.cpp
View File

@ -278,14 +278,14 @@ void RimCommandIssueFieldChanged::childObjects(caf::PdmObject* pdmObject, std::v
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmObjectHandle* RimCommandIssueFieldChanged::findObjectByName(caf::PdmObjectHandle* pdmObject, const QString& objectName) caf::PdmObjectHandle* RimCommandIssueFieldChanged::findObjectByName(caf::PdmObjectHandle* pdmObject, const QString& name)
{ {
std::vector<caf::PdmFieldHandle*> fields; std::vector<caf::PdmFieldHandle*> fields;
pdmObject->fields(fields); pdmObject->fields(fields);
caf::PdmUiObjectHandle* uiObjectHandle = uiObj(pdmObject); caf::PdmUiObjectHandle* uiObjectHandle = uiObj(pdmObject);
if (uiObjectHandle && uiObjectHandle->uiName() == objectName) if (uiObjectHandle && uiObjectHandle->uiName() == name)
{ {
return pdmObject; return pdmObject;
} }
@ -299,7 +299,7 @@ caf::PdmObjectHandle* RimCommandIssueFieldChanged::findObjectByName(caf::PdmObje
for (size_t cIdx = 0; cIdx < children.size(); cIdx++) for (size_t cIdx = 0; cIdx < children.size(); cIdx++)
{ {
PdmObjectHandle* candidateObj = findObjectByName(children[cIdx], objectName); PdmObjectHandle* candidateObj = findObjectByName(children[cIdx], name);
if (candidateObj) if (candidateObj)
{ {
return candidateObj; return candidateObj;

2
ApplicationCode/ProjectDataModel/RimCommandObject.h
View File

@ -93,7 +93,7 @@ public:
private: private:
void childObjects(caf::PdmObject* pdmObject, std::vector<caf::PdmObjectHandle*>& children); void childObjects(caf::PdmObject* pdmObject, std::vector<caf::PdmObjectHandle*>& children);
caf::PdmObjectHandle* findObjectByName(caf::PdmObjectHandle* root, const QString& objectName); caf::PdmObjectHandle* findObjectByName(caf::PdmObjectHandle* root, const QString& name);
caf::PdmFieldHandle* findFieldByKeyword(caf::PdmObjectHandle* pdmObject, const QString& fieldName); caf::PdmFieldHandle* findFieldByKeyword(caf::PdmObjectHandle* pdmObject, const QString& fieldName);
}; };

4
ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp
View File

@ -110,9 +110,9 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
} }
} }
for (Rim3dView* view : views) for (Rim3dView* rim3dView : views)
{ {
RiaOptionItemFactory::appendOptionItemFromViewNameAndCaseName(view, &options); RiaOptionItemFactory::appendOptionItemFromViewNameAndCaseName(rim3dView, &options);
} }
} }
else if (fieldNeedingOptions == &eclipseResultType) else if (fieldNeedingOptions == &eclipseResultType)