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

QmlDesigner: Rename removeVariantProperty in removeProperty

Browse Source 
Change-Id: Id350f7d3e215d08210a3a535f89b12fe15928321
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-06-25 12:24:37 +02:00
parent 7048709ab8
commit 24d1e54490
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
View File

@@ -508,7 +508,7 @@ void PropertyEditor::changeValue(const QString &name)
try { try {
if (!value->value().isValid()) { //reset if (!value->value().isValid()) { //reset
fxObjectNode.removeVariantProperty(propertyName); fxObjectNode.removeProperty(propertyName);
} else { } else {
if (castedValue.isValid() && !castedValue.isNull()) { if (castedValue.isValid() && !castedValue.isNull()) {
m_locked = true; m_locked = true;

2
src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
View File

@@ -363,7 +363,7 @@ void PropertyEditorNodeWrapper::changeValue(const QString &propertyName)
if (valueObject->value().isValid()) if (valueObject->value().isValid())
fxObjectNode.setVariantProperty(name, valueObject->value()); fxObjectNode.setVariantProperty(name, valueObject->value());
else else
fxObjectNode.removeVariantProperty(name); fxObjectNode.removeProperty(name);
} }
} }

2
src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
View File

@@ -89,7 +89,7 @@ public:
QList<QmlModelState> allAffectingStates() const; QList<QmlModelState> allAffectingStates() const;
QList<QmlModelStateOperation> allAffectingStatesOperations() const; QList<QmlModelStateOperation> allAffectingStatesOperations() const;
void removeVariantProperty(const PropertyName &name); void removeProperty(const PropertyName &name);
void setParent(QmlObjectNode newParent); void setParent(QmlObjectNode newParent);

2
src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
View File

@@ -364,7 +364,7 @@ QList<QmlModelState> QmlObjectNode::allDefinedStates() const
*/ */
void QmlObjectNode::removeVariantProperty(const PropertyName &name) void QmlObjectNode::removeProperty(const PropertyName &name)
{ {
if (!isValid()) if (!isValid())
throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__);