aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2013-03-05 12:19:19 +0100
committerThomas Hartmann <Thomas.Hartmann@digia.com>2013-03-25 13:35:11 +0100
commitd204ee0b4325a639ea54ffcb8274877720606f31 (patch)
tree3c570a3d136add4b7476f62e31dd76d29a882f2e /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h
parentdd9b1687026c3fea4938e5e65dc7e1ba3fd5ba6a (diff)
QmlDesigner: Type of the propertyname is now PropertyName
And PropertyName is a typedef for QByteArray. Because we don't use the features of QString and the source would be cluttered with QLatin1Strings we changed the property name to QByteArray. Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> (cherry picked from commit ee4bf638cad9bcf303c8c6ad1f922c33dc021964) Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h
index 85307a94a7..a230e6f1d9 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h
@@ -117,13 +117,13 @@ public:
double zValue() const;
double opacity() const;
- QVariant property(const QString &name) const;
- QVariant defaultValue(const QString &name) const;
- QString instanceType(const QString &name) const;
- QStringList propertyNames() const;
+ QVariant property(const PropertyName &name) const;
+ QVariant defaultValue(const PropertyName &name) const;
+ QString instanceType(const PropertyName &name) const;
+ PropertyNameList propertyNames() const;
- bool hasBindingForProperty(const QString &name, bool *hasChanged = 0) const;
+ bool hasBindingForProperty(const PropertyName &name, bool *hasChanged = 0) const;
bool isValid() const;
void makeInvalid();
@@ -137,12 +137,12 @@ public:
bool isWrappingThisObject(QObject *object) const;
- QVariant resetVariant(const QString &name) const;
+ QVariant resetVariant(const PropertyName &name) const;
- bool hasAnchor(const QString &name) const;
+ bool hasAnchor(const PropertyName &name) const;
bool isAnchoredBySibling() const;
bool isAnchoredByChildren() const;
- QPair<QString, ServerNodeInstance> anchor(const QString &name) const;
+ QPair<PropertyName, ServerNodeInstance> anchor(const PropertyName &name) const;
int penWidth() const;
@@ -163,27 +163,27 @@ public:
private: // functions
ServerNodeInstance(const QSharedPointer<Internal::ObjectNodeInstance> &abstractInstance);
- void setPropertyVariant(const QString &name, const QVariant &value);
- void setPropertyDynamicVariant(const QString &name, const QString &typeName, const QVariant &value);
+ void setPropertyVariant(const PropertyName &name, const QVariant &value);
+ void setPropertyDynamicVariant(const PropertyName &name, const TypeName &typeName, const QVariant &value);
- void setPropertyBinding(const QString &name, const QString &expression);
- void setPropertyDynamicBinding(const QString &name, const QString &typeName, const QString &expression);
+ void setPropertyBinding(const PropertyName &name, const QString &expression);
+ void setPropertyDynamicBinding(const PropertyName &name, const TypeName &typeName, const QString &expression);
- void resetProperty(const QString &name);
- void refreshProperty(const QString &name);
+ void resetProperty(const PropertyName &name);
+ void refreshProperty(const PropertyName &name);
void activateState();
void deactivateState();
void refreshState();
- bool updateStateVariant(const ServerNodeInstance &target, const QString &propertyName, const QVariant &value);
- bool updateStateBinding(const ServerNodeInstance &target, const QString &propertyName, const QString &expression);
- bool resetStateProperty(const ServerNodeInstance &target, const QString &propertyName, const QVariant &resetValue);
+ bool updateStateVariant(const ServerNodeInstance &target, const PropertyName &propertyName, const QVariant &value);
+ bool updateStateBinding(const ServerNodeInstance &target, const PropertyName &propertyName, const QString &expression);
+ bool resetStateProperty(const ServerNodeInstance &target, const PropertyName &propertyName, const QVariant &resetValue);
static ServerNodeInstance create(NodeInstanceServer *nodeInstanceServer, const InstanceContainer &instanceContainer, ComponentWrap componentWrap);
void setDeleteHeldInstance(bool deleteInstance);
- void reparent(const ServerNodeInstance &oldParentInstance, const QString &oldParentProperty, const ServerNodeInstance &newParentInstance, const QString &newParentProperty);
+ void reparent(const ServerNodeInstance &oldParentInstance, const PropertyName &oldParentProperty, const ServerNodeInstance &newParentInstance, const PropertyName &newParentProperty);
void setId(const QString &id);