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

Renamed to nameField() to avoid duplication of name()

Browse Source
This commit is contained in:
Magne Sjaastad 2017-06-08 13:31:53 +02:00
parent 5cad6cd376
commit e1f4dbfcf8
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp
View File

@ -40,7 +40,7 @@ RimFishboneWellPathCollection::RimFishboneWellPathCollection()
{ {
CAF_PDM_InitObject("WellPathCompletions", ":/FishBoneGroupFromFile16x16.png", "", ""); CAF_PDM_InitObject("WellPathCompletions", ":/FishBoneGroupFromFile16x16.png", "", "");
name()->uiCapability()->setUiHidden(true); nameField()->uiCapability()->setUiHidden(true);
this->setName("Well Paths"); this->setName("Well Paths");
CAF_PDM_InitFieldNoDefault(&m_wellPaths, "WellPaths", "Well Paths", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_wellPaths, "WellPaths", "Well Paths", "", "", "");

2
ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
View File

@ -40,7 +40,7 @@ RimFishbonesCollection::RimFishbonesCollection()
{ {
CAF_PDM_InitObject("Fishbones", ":/FishBones16x16.png", "", ""); CAF_PDM_InitObject("Fishbones", ":/FishBones16x16.png", "", "");
name()->uiCapability()->setUiHidden(true); nameField()->uiCapability()->setUiHidden(true);
this->setName("Fishbones"); this->setName("Fishbones");
CAF_PDM_InitFieldNoDefault(&fishbonesSubs, "FishbonesSubs", "fishbonesSubs", "", "", ""); CAF_PDM_InitFieldNoDefault(&fishbonesSubs, "FishbonesSubs", "fishbonesSubs", "", "", "");

2
ApplicationCode/ProjectDataModel/Completions/RimFishbonesMultipleSubs.cpp
View File

@ -100,7 +100,7 @@ RimFishbonesMultipleSubs::RimFishbonesMultipleSubs()
m_pipeProperties = new RimFishbonesPipeProperties; m_pipeProperties = new RimFishbonesPipeProperties;
name()->uiCapability()->setUiReadOnly(true); nameField()->uiCapability()->setUiReadOnly(true);
m_rigFishbonesGeometry = std::unique_ptr<RigFisbonesGeometry>(new RigFisbonesGeometry(this)); m_rigFishbonesGeometry = std::unique_ptr<RigFisbonesGeometry>(new RigFisbonesGeometry(this));

2
ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp
View File

@ -40,7 +40,7 @@ RimPerforationCollection::RimPerforationCollection()
{ {
CAF_PDM_InitObject("Perforations", ":/PerforationIntervals16x16.png", "", ""); CAF_PDM_InitObject("Perforations", ":/PerforationIntervals16x16.png", "", "");
name()->uiCapability()->setUiHidden(true); nameField()->uiCapability()->setUiHidden(true);
this->setName("Perforations"); this->setName("Perforations");
CAF_PDM_InitFieldNoDefault(&m_perforations, "Perforations", "Perforations", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_perforations, "Perforations", "Perforations", "", "", "");

2
ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp
View File

@ -46,7 +46,7 @@ RimPerforationInterval::RimPerforationInterval()
CAF_PDM_InitFieldNoDefault(&m_date, "StartDate", "Start Date", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_date, "StartDate", "Start Date", "", "", "");
m_date.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName()); m_date.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName());
name()->uiCapability()->setUiReadOnly(true); nameField()->uiCapability()->setUiReadOnly(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/RimNamedObject.cpp
View File

@ -57,13 +57,13 @@ void RimNamedObject::setName(const QString& name)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimNamedObject::userDescriptionField() caf::PdmFieldHandle* RimNamedObject::userDescriptionField()
{ {
return name(); return nameField();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimNamedObject::name() caf::PdmFieldHandle* RimNamedObject::nameField()
{ {
return &m_name; return &m_name;
} }

2
ApplicationCode/ProjectDataModel/RimNamedObject.h
View File

@ -41,7 +41,7 @@ protected:
virtual caf::PdmFieldHandle* userDescriptionField() override; virtual caf::PdmFieldHandle* userDescriptionField() override;
// To be used from derived objects when manipulating visibility and ui ordering // To be used from derived objects when manipulating visibility and ui ordering
caf::PdmFieldHandle* name(); caf::PdmFieldHandle* nameField();
private: private:
caf::PdmField<QString> m_name; caf::PdmField<QString> m_name;