From 0de92376999fac810fb28f30723e64aaed257fcb Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Mon, 15 Apr 2013 13:55:46 +0200
Subject: [PATCH] QmlDesigner: Add PropertyName usage in instances
Change-Id: Ia7eb8730c61347833c70a3d62787c10e2a3134ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
.../instances/anchorchangesnodeinstance.cpp | 13 ++++++-------
.../instances/anchorchangesnodeinstance.h | 12 ++++++------
.../qml2puppet/instances/dummynodeinstance.cpp | 6 +++---
.../qml2puppet/instances/dummynodeinstance.h | 6 +++---
.../instances/anchorchangesnodeinstance.cpp | 12 ++++++------
.../qmlpuppet/instances/anchorchangesnodeinstance.h | 12 ++++++------
.../qmlpuppet/instances/dummynodeinstance.cpp | 6 +++---
.../qmlpuppet/instances/dummynodeinstance.h | 7 ++++---
8 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
index 41a34cc7a27..81e51cae126 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
@@ -49,28 +49,27 @@ AnchorChangesNodeInstance::Pointer AnchorChangesNodeInstance::create(QObject *ob
return instance;
}
-void AnchorChangesNodeInstance::setPropertyVariant(const QString &/*name*/, const QVariant &/*value*/)
+void AnchorChangesNodeInstance::setPropertyVariant(const PropertyName &/*name*/, const QVariant &/*value*/)
{
}
-void AnchorChangesNodeInstance::setPropertyBinding(const QString &/*name*/, const QString &/*expression*/)
+void AnchorChangesNodeInstance::setPropertyBinding(const PropertyName &/*name*/, const QString &/*expression*/)
{
}
-QVariant AnchorChangesNodeInstance::property(const QString &/*name*/) const
+QVariant AnchorChangesNodeInstance::property(const PropertyName &/*name*/) const
{
return QVariant();
}
-void AnchorChangesNodeInstance::resetProperty(const QString &/*name*/)
+void AnchorChangesNodeInstance::resetProperty(const PropertyName &/*name*/)
{
}
-
void AnchorChangesNodeInstance::reparent(const ServerNodeInstance &/*oldParentInstance*/,
- const QString &/*oldParentProperty*/,
+ const PropertyName &/*oldParentProperty*/,
const ServerNodeInstance &/*newParentInstance*/,
- const QString &/*newParentProperty*/)
+ const PropertyName &/*newParentProperty*/)
{
}
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
index a2e3f600b8b..612324f2306 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
@@ -52,16 +52,16 @@ public:
static Pointer create(QObject *objectToBeWrapped);
- virtual void setPropertyVariant(const QString &name, const QVariant &value);
- virtual void setPropertyBinding(const QString &name, const QString &expression);
- virtual QVariant property(const QString &name) const;
- virtual void resetProperty(const QString &name);
+ virtual void setPropertyVariant(const PropertyName &name, const QVariant &value);
+ virtual void setPropertyBinding(const PropertyName &name, const QString &expression);
+ virtual QVariant property(const PropertyName &name) const;
+ virtual void resetProperty(const PropertyName &name);
using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
void reparent(const ServerNodeInstance &oldParentInstance,
- const QString &oldParentProperty,
+ const PropertyName &oldParentProperty,
const ServerNodeInstance &newParentInstance,
- const QString &newParentProperty);
+ const PropertyName &newParentProperty);
protected:
AnchorChangesNodeInstance(QObject *object);
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp
index 3ee9ae4eff9..3ba0afc025b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp
@@ -71,11 +71,11 @@ double DummyNodeInstance::opacity() const
return 0.0;
}
-void DummyNodeInstance::setPropertyVariant(const QString &/*name*/, const QVariant &/*value*/)
+void DummyNodeInstance::setPropertyVariant(const PropertyName &/*name*/, const QVariant &/*value*/)
{
}
-void DummyNodeInstance::setPropertyBinding(const QString &/*name*/, const QString &/*expression*/)
+void DummyNodeInstance::setPropertyBinding(const PropertyName &/*name*/, const QString &/*expression*/)
{
}
@@ -85,7 +85,7 @@ void DummyNodeInstance::setId(const QString &/*id*/)
}
-QVariant DummyNodeInstance::property(const QString &/*name*/) const
+QVariant DummyNodeInstance::property(const PropertyName &/*name*/) const
{
return QVariant();
}
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
index 357dcb42631..3746e62a242 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
@@ -53,10 +53,10 @@ public:
QTransform transform() const;
double opacity() const;
- void setPropertyVariant(const QString &name, const QVariant &value);
- void setPropertyBinding(const QString &name, const QString &expression);
+ void setPropertyVariant(const PropertyName &name, const QVariant &value);
+ void setPropertyBinding(const PropertyName &name, const QString &expression);
void setId(const QString &id);
- QVariant property(const QString &name) const;
+ QVariant property(const PropertyName &name) const;
QStringList properties();
QStringList localProperties();
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp
index 41a34cc7a27..2a7f17c7151 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp
@@ -49,28 +49,28 @@ AnchorChangesNodeInstance::Pointer AnchorChangesNodeInstance::create(QObject *ob
return instance;
}
-void AnchorChangesNodeInstance::setPropertyVariant(const QString &/*name*/, const QVariant &/*value*/)
+void AnchorChangesNodeInstance::setPropertyVariant(const PropertyName &/*name*/, const QVariant &/*value*/)
{
}
-void AnchorChangesNodeInstance::setPropertyBinding(const QString &/*name*/, const QString &/*expression*/)
+void AnchorChangesNodeInstance::setPropertyBinding(const PropertyName &/*name*/, const QString &/*expression*/)
{
}
-QVariant AnchorChangesNodeInstance::property(const QString &/*name*/) const
+QVariant AnchorChangesNodeInstance::property(const PropertyName &/*name*/) const
{
return QVariant();
}
-void AnchorChangesNodeInstance::resetProperty(const QString &/*name*/)
+void AnchorChangesNodeInstance::resetProperty(const PropertyName &/*name*/)
{
}
void AnchorChangesNodeInstance::reparent(const ServerNodeInstance &/*oldParentInstance*/,
- const QString &/*oldParentProperty*/,
+ const PropertyName &/*oldParentProperty*/,
const ServerNodeInstance &/*newParentInstance*/,
- const QString &/*newParentProperty*/)
+ const PropertyName &/*newParentProperty*/)
{
}
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
index 595f813cc4f..d1418a976d6 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
@@ -53,16 +53,16 @@ public:
static Pointer create(QObject *objectToBeWrapped);
- virtual void setPropertyVariant(const QString &name, const QVariant &value);
- virtual void setPropertyBinding(const QString &name, const QString &expression);
- virtual QVariant property(const QString &name) const;
- virtual void resetProperty(const QString &name);
+ virtual void setPropertyVariant(const PropertyName &name, const QVariant &value);
+ virtual void setPropertyBinding(const PropertyName &name, const QString &expression);
+ virtual QVariant property(const PropertyName &name) const;
+ virtual void resetProperty(const PropertyName &name);
using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
void reparent(const ServerNodeInstance &oldParentInstance,
- const QString &oldParentProperty,
+ const PropertyName &oldParentProperty,
const ServerNodeInstance &newParentInstance,
- const QString &newParentProperty);
+ const PropertyName &newParentProperty);
protected:
AnchorChangesNodeInstance(QObject *object);
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp
index 5c8173c2dd8..69547501fb3 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp
@@ -70,11 +70,11 @@ double DummyNodeInstance::opacity() const
return 0.0;
}
-void DummyNodeInstance::setPropertyVariant(const QString &/*name*/, const QVariant &/*value*/)
+void DummyNodeInstance::setPropertyVariant(const PropertyName &/*name*/, const QVariant &/*value*/)
{
}
-void DummyNodeInstance::setPropertyBinding(const QString &/*name*/, const QString &/*expression*/)
+void DummyNodeInstance::setPropertyBinding(const PropertyName &/*name*/, const QString &/*expression*/)
{
}
@@ -84,7 +84,7 @@ void DummyNodeInstance::setId(const QString &/*id*/)
}
-QVariant DummyNodeInstance::property(const QString &/*name*/) const
+QVariant DummyNodeInstance::property(const PropertyName &/*name*/) const
{
return QVariant();
}
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h
index 357dcb42631..50335eb8530 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h
@@ -53,12 +53,13 @@ public:
QTransform transform() const;
double opacity() const;
- void setPropertyVariant(const QString &name, const QVariant &value);
- void setPropertyBinding(const QString &name, const QString &expression);
+ void setPropertyVariant(const PropertyName &name, const QVariant &value);
+ void setPropertyBinding(const PropertyName &name, const QString &expression);
void setId(const QString &id);
- QVariant property(const QString &name) const;
QStringList properties();
QStringList localProperties();
+ QVariant property(const PropertyName &name) const;
+
void initializePropertyWatcher(const ObjectNodeInstance::Pointer &objectNodeInstance);
--
GitLab