From 1a3d8a13af1db8fc390d5d2f06c571a556126f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 24 Aug 2016 15:16:34 +0200 Subject: [PATCH] Made uiCapability and xmlCapability const --- .../cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h | 6 +++--- .../cafPdmUiCore/cafPdmUiObjectHandle.cpp | 2 +- .../cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h index 31c6412634..5a16fea7ed 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmObjectHandle.h @@ -46,7 +46,7 @@ public: void addCapability(PdmObjectCapability* capability, bool takeOwnership) { m_capabilities.push_back(std::make_pair(capability, takeOwnership)); } template - CapabilityType* capability() + CapabilityType* capability() const { for (size_t i = 0; i < m_capabilities.size(); ++i) { @@ -56,8 +56,8 @@ public: return NULL; } - PdmUiObjectHandle* uiCapability(); // Implementation is in cafPdmUiObjectHandle.cpp - PdmXmlObjectHandle* xmlCapability(); // Implementation is in cafPdmXmlObjectHandle.cpp + PdmUiObjectHandle* uiCapability() const; // Implementation is in cafPdmUiObjectHandle.cpp + PdmXmlObjectHandle* xmlCapability() const; // Implementation is in cafPdmXmlObjectHandle.cpp protected: void addField(PdmFieldHandle* field, const QString& keyword); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp index 8a61cfd718..bcd9d6bd43 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp @@ -228,7 +228,7 @@ void PdmUiObjectHandle::updateUiIconFromToggleField() //-------------------------------------------------------------------------------------------------- /// Implementation of uiCapability() defined in cafPdmObjectHandle.h //-------------------------------------------------------------------------------------------------- -PdmUiObjectHandle* PdmObjectHandle::uiCapability() +PdmUiObjectHandle* PdmObjectHandle::uiCapability() const { PdmUiObjectHandle* uiField = capability(); assert(uiField); diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp index b5fb344fc5..9bcaa193a5 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXmlObjectHandle.cpp @@ -337,7 +337,7 @@ void PdmXmlObjectHandle::setupBeforeSaveRecursively(PdmObjectHandle* object) //-------------------------------------------------------------------------------------------------- /// Implementation of xmlCapability() defined in cafPdmObjectHandle.h //-------------------------------------------------------------------------------------------------- -PdmXmlObjectHandle* PdmObjectHandle::xmlCapability() +PdmXmlObjectHandle* PdmObjectHandle::xmlCapability() const { PdmXmlObjectHandle* xmlField = capability(); assert(xmlField);