From 24d1e54490f7cb74ce9db0a3ece75cf916a5f8f9 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Tue, 25 Jun 2013 12:24:37 +0200
Subject: [PATCH] QmlDesigner: Rename removeVariantProperty in removeProperty

Change-Id: Id350f7d3e215d08210a3a535f89b12fe15928321
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
 .../qmldesigner/components/propertyeditor/propertyeditor.cpp    | 2 +-
 .../components/propertyeditor/propertyeditorvalue.cpp           | 2 +-
 src/plugins/qmldesigner/designercore/include/qmlobjectnode.h    | 2 +-
 src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index 3b3281fcadb..93d4e3035ea 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -508,7 +508,7 @@ void PropertyEditor::changeValue(const QString &name)
 
         try {
             if (!value->value().isValid()) { //reset
-                fxObjectNode.removeVariantProperty(propertyName);
+                fxObjectNode.removeProperty(propertyName);
             } else {
                 if (castedValue.isValid() && !castedValue.isNull()) {
                     m_locked = true;
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index 27d38533305..f9bfd721a9a 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -363,7 +363,7 @@ void PropertyEditorNodeWrapper::changeValue(const QString &propertyName)
         if (valueObject->value().isValid())
             fxObjectNode.setVariantProperty(name, valueObject->value());
         else
-            fxObjectNode.removeVariantProperty(name);
+            fxObjectNode.removeProperty(name);
     }
 }
 
diff --git a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
index 092b19f6c0a..11d63dc79c1 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
@@ -89,7 +89,7 @@ public:
     QList<QmlModelState> allAffectingStates() const;
     QList<QmlModelStateOperation> allAffectingStatesOperations() const;
 
-    void removeVariantProperty(const PropertyName &name);
+    void removeProperty(const PropertyName &name);
 
     void setParent(QmlObjectNode newParent);
 
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
index 42c41dc6ab8..9343d45b54e 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
@@ -364,7 +364,7 @@ QList<QmlModelState> QmlObjectNode::allDefinedStates() const
 
 */
 
-void  QmlObjectNode::removeVariantProperty(const PropertyName &name)
+void  QmlObjectNode::removeProperty(const PropertyName &name)
 {
     if (!isValid())
         throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__);