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

QmlDesigner: Add PropertyName usage in instances

Browse Source 
Change-Id: Ia7eb8730c61347833c70a3d62787c10e2a3134ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-04-15 13:55:46 +02:00
parent 09f20adc7b
commit 0de9237699
8 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
View File

@@ -49,28 +49,27 @@ AnchorChangesNodeInstance::Pointer AnchorChangesNodeInstance::create(QObject *ob
return instance; 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(); return QVariant();
} }
void AnchorChangesNodeInstance::resetProperty(const QString &/*name*/) void AnchorChangesNodeInstance::resetProperty(const PropertyName &/*name*/)
{ {
} }
void AnchorChangesNodeInstance::reparent(const ServerNodeInstance &/*oldParentInstance*/, void AnchorChangesNodeInstance::reparent(const ServerNodeInstance &/*oldParentInstance*/,
const QString &/*oldParentProperty*/, const PropertyName &/*oldParentProperty*/,
const ServerNodeInstance &/*newParentInstance*/, const ServerNodeInstance &/*newParentInstance*/,
const QString &/*newParentProperty*/) const PropertyName &/*newParentProperty*/)
{ {
} }

12
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
View File

@@ -52,16 +52,16 @@ public:
static Pointer create(QObject *objectToBeWrapped); static Pointer create(QObject *objectToBeWrapped);
virtual void setPropertyVariant(const QString &name, const QVariant &value); virtual void setPropertyVariant(const PropertyName &name, const QVariant &value);
virtual void setPropertyBinding(const QString &name, const QString &expression); virtual void setPropertyBinding(const PropertyName &name, const QString &expression);
virtual QVariant property(const QString &name) const; virtual QVariant property(const PropertyName &name) const;
virtual void resetProperty(const QString &name); virtual void resetProperty(const PropertyName &name);
using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
void reparent(const ServerNodeInstance &oldParentInstance, void reparent(const ServerNodeInstance &oldParentInstance,
const QString &oldParentProperty, const PropertyName &oldParentProperty,
const ServerNodeInstance &newParentInstance, const ServerNodeInstance &newParentInstance,
const QString &newParentProperty); const PropertyName &newParentProperty);
protected: protected:
AnchorChangesNodeInstance(QObject *object); AnchorChangesNodeInstance(QObject *object);

6
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp
View File

@@ -71,11 +71,11 @@ double DummyNodeInstance::opacity() const
return 0.0; 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(); return QVariant();
} }

6
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
View File

@@ -53,10 +53,10 @@ public:
QTransform transform() const; QTransform transform() const;
double opacity() const; double opacity() const;
void setPropertyVariant(const QString &name, const QVariant &value); void setPropertyVariant(const PropertyName &name, const QVariant &value);
void setPropertyBinding(const QString &name, const QString &expression); void setPropertyBinding(const PropertyName &name, const QString &expression);
void setId(const QString &id); void setId(const QString &id);
QVariant property(const QString &name) const; QVariant property(const PropertyName &name) const;
QStringList properties(); QStringList properties();
QStringList localProperties(); QStringList localProperties();

12
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp
View File

@@ -49,28 +49,28 @@ AnchorChangesNodeInstance::Pointer AnchorChangesNodeInstance::create(QObject *ob
return instance; 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(); return QVariant();
} }
void AnchorChangesNodeInstance::resetProperty(const QString &/*name*/) void AnchorChangesNodeInstance::resetProperty(const PropertyName &/*name*/)
{ {
} }
void AnchorChangesNodeInstance::reparent(const ServerNodeInstance &/*oldParentInstance*/, void AnchorChangesNodeInstance::reparent(const ServerNodeInstance &/*oldParentInstance*/,
const QString &/*oldParentProperty*/, const PropertyName &/*oldParentProperty*/,
const ServerNodeInstance &/*newParentInstance*/, const ServerNodeInstance &/*newParentInstance*/,
const QString &/*newParentProperty*/) const PropertyName &/*newParentProperty*/)
{ {
} }

12
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
View File

@@ -53,16 +53,16 @@ public:
static Pointer create(QObject *objectToBeWrapped); static Pointer create(QObject *objectToBeWrapped);
virtual void setPropertyVariant(const QString &name, const QVariant &value); virtual void setPropertyVariant(const PropertyName &name, const QVariant &value);
virtual void setPropertyBinding(const QString &name, const QString &expression); virtual void setPropertyBinding(const PropertyName &name, const QString &expression);
virtual QVariant property(const QString &name) const; virtual QVariant property(const PropertyName &name) const;
virtual void resetProperty(const QString &name); virtual void resetProperty(const PropertyName &name);
using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
void reparent(const ServerNodeInstance &oldParentInstance, void reparent(const ServerNodeInstance &oldParentInstance,
const QString &oldParentProperty, const PropertyName &oldParentProperty,
const ServerNodeInstance &newParentInstance, const ServerNodeInstance &newParentInstance,
const QString &newParentProperty); const PropertyName &newParentProperty);
protected: protected:
AnchorChangesNodeInstance(QObject *object); AnchorChangesNodeInstance(QObject *object);

6
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp
View File

@@ -70,11 +70,11 @@ double DummyNodeInstance::opacity() const
return 0.0; 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(); return QVariant();
} }

7
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h
View File

@@ -53,12 +53,13 @@ public:
QTransform transform() const; QTransform transform() const;
double opacity() const; double opacity() const;
void setPropertyVariant(const QString &name, const QVariant &value); void setPropertyVariant(const PropertyName &name, const QVariant &value);
void setPropertyBinding(const QString &name, const QString &expression); void setPropertyBinding(const PropertyName &name, const QString &expression);
void setId(const QString &id); void setId(const QString &id);
QVariant property(const QString &name) const;
QStringList properties(); QStringList properties();
QStringList localProperties(); QStringList localProperties();
QVariant property(const PropertyName &name) const;
void initializePropertyWatcher(const ObjectNodeInstance::Pointer &objectNodeInstance); void initializePropertyWatcher(const ObjectNodeInstance::Pointer &objectNodeInstance);