feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Remove AuxiliaryDataauxilary if data is invalid

Browse Source 
Change-Id: Ifc802442f54b4c84e1df04cbd8c59ad48c745aa5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-08-05 15:20:30 +02:00
committed by Thomas Hartmann
parent 835ef9507b
commit 56bdb0d1ea
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/designercore/model/internalnode.cpp
View File

@@ -174,6 +174,11 @@ void InternalNode::setAuxiliaryData(const PropertyName &name, const QVariant &da
m_auxiliaryDataHash.insert(name, data); m_auxiliaryDataHash.insert(name, data);
} }
void InternalNode::removeAuxiliaryData(const PropertyName &name)
{
m_auxiliaryDataHash.remove(name);
}
bool InternalNode::hasAuxiliaryData(const PropertyName &name) const bool InternalNode::hasAuxiliaryData(const PropertyName &name) const
{ {
return m_auxiliaryDataHash.contains(name); return m_auxiliaryDataHash.contains(name);

1
src/plugins/qmldesigner/designercore/model/internalnode_p.h
View File

@@ -89,6 +89,7 @@ public:
QVariant auxiliaryData(const PropertyName &name) const; QVariant auxiliaryData(const PropertyName &name) const;
void setAuxiliaryData(const PropertyName &name, const QVariant &data); void setAuxiliaryData(const PropertyName &name, const QVariant &data);
void removeAuxiliaryData(const PropertyName &name);
bool hasAuxiliaryData(const PropertyName &name) const; bool hasAuxiliaryData(const PropertyName &name) const;
QHash<PropertyName, QVariant> auxiliaryData() const; QHash<PropertyName, QVariant> auxiliaryData() const;

6
src/plugins/qmldesigner/designercore/model/model.cpp
View File

@@ -803,7 +803,11 @@ void ModelPrivate::notifyPropertiesAboutToBeRemoved(const QList<InternalProperty
void ModelPrivate::setAuxiliaryData(const InternalNode::Pointer& node, const PropertyName &name, const QVariant &data) void ModelPrivate::setAuxiliaryData(const InternalNode::Pointer& node, const PropertyName &name, const QVariant &data)
{ {
node->setAuxiliaryData(name, data); if (data.isValid())
node->setAuxiliaryData(name, data);
else
node->removeAuxiliaryData(name);
notifyAuxiliaryDataChanged(node, name,data); notifyAuxiliaryDataChanged(node, name,data);
} }