From e1e8e9fdf30d4730eee284dc67dec296fce2b315 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Thu, 18 Mar 2010 11:48:50 +0100
Subject: [PATCH] QmlDesigner.propertyEditor: listen to propertyRemoved instead
of propertiesAboutToBeRemoved
---
.../components/propertyeditor/propertyeditor.cpp | 4 ++--
.../qmldesigner/components/propertyeditor/propertyeditor.h | 6 +-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index dc922630b02..67b1141e6cd 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -699,9 +699,9 @@ void PropertyEditor::modelAboutToBeDetached(Model *model)
}
-void PropertyEditor::propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList)
+void PropertyEditor::propertiesRemoved(const QList<AbstractProperty>& propertyList)
{
- QmlModelView::propertiesAboutToBeRemoved(propertyList);
+ QmlModelView::propertiesRemoved(propertyList);
if (!m_selectedNode.isValid())
return;
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
index 730db75dc37..d8d48eb44c7 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
@@ -81,7 +81,7 @@ public:
void nodeAboutToBeRemoved(const ModelNode &removedNode);
void propertiesAdded(const NodeState &state, const QList<NodeProperty>& propertyList);
- void propertiesAboutToBeRemoved(const NodeState &state, const QList<NodeProperty>& propertyList);
+ void propertiesRemoved(const QList<AbstractProperty>& propertyList);
void propertyValuesChanged(const NodeState &state, const QList<NodeProperty>& propertyList);
void modelAttached(Model *model);
@@ -90,10 +90,6 @@ public:
ModelState modelState() const;
-
-
-
- void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList);
void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange);
void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange);
--
GitLab