Replaced uiField() and xmlField() with uiCapability() and xmlCapability()

This commit is contained in:
Magne Sjaastad
2015-08-05 12:34:07 +02:00
parent a88b3cac83
commit 57e363896f
28 changed files with 129 additions and 110 deletions

View File

@@ -144,7 +144,7 @@ void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName)
}
*/
caf::PdmUiFieldHandle* uiFieldHandle = uiField(field);
caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
QString editorTypeName;
if (uiFieldHandle && uiFieldHandle->uiValue().type() == QVariant::Bool)
@@ -181,7 +181,7 @@ void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName)
// See Qt doc for QToolBar::insertWidget
QAction* action = m_actions[i];
caf::PdmUiFieldHandle* uiFieldHandle = uiField(field);
caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
if (uiFieldHandle)
{
action->setEnabled(!uiFieldHandle->isUiReadOnly(uiConfigName));
@@ -201,7 +201,7 @@ void PdmUiToolBarEditor::setFields(std::vector<caf::PdmFieldHandle*>& fields)
for (size_t i = 0; i < fields.size(); i++)
{
caf::PdmUiFieldHandle* uiFieldHandle = uiField(fields[i]);
caf::PdmUiFieldHandle* uiFieldHandle = fields[i]->uiCapability();
// Supports only bool fields
assert(uiFieldHandle->uiValue().type() == QVariant::Bool);