Commit 8b5cc1a6 authored by Yumin Yuan's avatar Yumin Yuan
Browse files

Fix more variable shadow warnings

parent d2d7c263
......@@ -749,7 +749,7 @@ void qtAssociationWidget::onDomainAssociationChanged()
return;
}
domainItem.disassociateAllAttributes(attSystem, uid); //detach all attributes
domainItem.disassociateAllAttributes(attSystem); //detach all attributes
if(combo->currentText().isEmpty())
{
......
......@@ -280,9 +280,9 @@ void qtAttributeDisplay::initSelectPropCombo(
// this->Internals->PropComboModel->disconnect();
// Adding an entry "Attribute" for the case that we just
// want the fact that the attribute existence, not an item value
QStandardItem* item = new QStandardItem;
item->setText("Attribute");
this->Internals->PropComboModel->insertRow(0, item);
QStandardItem* pitem = new QStandardItem;
pitem->setText("Attribute");
this->Internals->PropComboModel->insertRow(0, pitem);
if(!attDef)
{
......@@ -315,16 +315,16 @@ void qtAttributeDisplay::initSelectPropCombo(
// No User data, not editable
std::string strItemLabel = attItem->label().empty() ? attItem->name() : attItem->label();
std::string keyName = childData->definition()->type() + strItemLabel;
QStandardItem* item = new QStandardItem;
item->setText(strItemLabel.c_str());
pitem = new QStandardItem;
pitem->setText(strItemLabel.c_str());
QVariant vdata;
vdata.setValue(static_cast<void*>(attItem.get()));
item->setData(vdata, Qt::UserRole);
this->Internals->PropComboModel->insertRow(row++, item);
pitem->setData(vdata, Qt::UserRole);
this->Internals->PropComboModel->insertRow(row++, pitem);
if(attItem->advanceLevel())
{
item->setFont(this->Internals->UIManager->advancedFont());
pitem->setFont(this->Internals->UIManager->advancedFont());
}
}
}
......
......@@ -681,7 +681,7 @@ bool EntityRef::disassociateAttribute(smtk::attribute::System* sys,
/**\brief Remove all attribute association form this entityref
*/
bool EntityRef::disassociateAllAttributes(smtk::attribute::System* sys,
const smtk::common::UUID& fromEntity, bool reverse)
bool reverse)
{
AttributeSet atts = this->attributes();
AttributeSet::const_iterator it;
......
......@@ -178,8 +178,7 @@ public:
bool associateAttribute(smtk::attribute::System* sys, const smtk::common::UUID &attribId);
bool disassociateAttribute(smtk::attribute::System* sys,
const smtk::common::UUID &attribId, bool reverse = true);
bool disassociateAllAttributes(smtk::attribute::System* sys,
const smtk::common::UUID& fromEntity, bool reverse = true);
bool disassociateAllAttributes(smtk::attribute::System* sys, bool reverse = true);
AttributeSet attributes() const;
......@@ -234,7 +233,7 @@ public:
// Manage embedded_in/includes relationships
EntityRef& embedEntity(const EntityRef& thingToEmbed);
template<typename T> EntityRef& embedEntities(const T& container);
bool isEmbedded(EntityRef& entity) const;
bool isEmbedded(EntityRef& ent) const;
EntityRef embeddedIn() const;
EntityRef& unembedEntity(const EntityRef& thingToUnembed);
template<typename T> EntityRef& unembedEntities(const T& container);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment