diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp index f19f13484f..68ab271978 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp @@ -40,7 +40,7 @@ RimFishboneWellPathCollection::RimFishboneWellPathCollection() { CAF_PDM_InitObject("WellPathCompletions", ":/FishBoneGroupFromFile16x16.png", "", ""); - name()->uiCapability()->setUiHidden(true); + nameField()->uiCapability()->setUiHidden(true); this->setName("Well Paths"); CAF_PDM_InitFieldNoDefault(&m_wellPaths, "WellPaths", "Well Paths", "", "", ""); diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp index 2fc1cf4301..3ff377e377 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp @@ -40,7 +40,7 @@ RimFishbonesCollection::RimFishbonesCollection() { CAF_PDM_InitObject("Fishbones", ":/FishBones16x16.png", "", ""); - name()->uiCapability()->setUiHidden(true); + nameField()->uiCapability()->setUiHidden(true); this->setName("Fishbones"); CAF_PDM_InitFieldNoDefault(&fishbonesSubs, "FishbonesSubs", "fishbonesSubs", "", "", ""); diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp index 88caf7156c..4192fee177 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp @@ -100,7 +100,7 @@ RimFishbonesMultipleSubs::RimFishbonesMultipleSubs() m_pipeProperties = new RimFishbonesPipeProperties; - name()->uiCapability()->setUiReadOnly(true); + nameField()->uiCapability()->setUiReadOnly(true); m_rigFishbonesGeometry = std::unique_ptr(new RigFisbonesGeometry(this)); diff --git a/ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp b/ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp index f10f22fc6f..96d1c15139 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp @@ -40,7 +40,7 @@ RimPerforationCollection::RimPerforationCollection() { CAF_PDM_InitObject("Perforations", ":/PerforationIntervals16x16.png", "", ""); - name()->uiCapability()->setUiHidden(true); + nameField()->uiCapability()->setUiHidden(true); this->setName("Perforations"); CAF_PDM_InitFieldNoDefault(&m_perforations, "Perforations", "Perforations", "", "", ""); diff --git a/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp b/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp index 093952e195..0ad6e882d5 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp @@ -46,7 +46,7 @@ RimPerforationInterval::RimPerforationInterval() CAF_PDM_InitFieldNoDefault(&m_date, "StartDate", "Start Date", "", "", ""); m_date.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName()); - name()->uiCapability()->setUiReadOnly(true); + nameField()->uiCapability()->setUiReadOnly(true); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimNamedObject.cpp b/ApplicationCode/ProjectDataModel/RimNamedObject.cpp index dcb52857ab..e9b91b0cad 100644 --- a/ApplicationCode/ProjectDataModel/RimNamedObject.cpp +++ b/ApplicationCode/ProjectDataModel/RimNamedObject.cpp @@ -57,13 +57,13 @@ void RimNamedObject::setName(const QString& name) //-------------------------------------------------------------------------------------------------- caf::PdmFieldHandle* RimNamedObject::userDescriptionField() { - return name(); + return nameField(); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -caf::PdmFieldHandle* RimNamedObject::name() +caf::PdmFieldHandle* RimNamedObject::nameField() { return &m_name; } diff --git a/ApplicationCode/ProjectDataModel/RimNamedObject.h b/ApplicationCode/ProjectDataModel/RimNamedObject.h index b4e5ff5718..6a8d6ed487 100644 --- a/ApplicationCode/ProjectDataModel/RimNamedObject.h +++ b/ApplicationCode/ProjectDataModel/RimNamedObject.h @@ -41,7 +41,7 @@ protected: virtual caf::PdmFieldHandle* userDescriptionField() override; // To be used from derived objects when manipulating visibility and ui ordering - caf::PdmFieldHandle* name(); + caf::PdmFieldHandle* nameField(); private: caf::PdmField m_name;