diff options
author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-03-05 12:19:19 +0100 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-03-05 12:34:39 +0100 |
commit | ee4bf638cad9bcf303c8c6ad1f922c33dc021964 (patch) | |
tree | abd2c363cc13cc6d805cf68e82cdf3c34836c87b /src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp | |
parent | e74d4c4870fe48a2989d1b49404b9f00da3902a4 (diff) | |
download | qt-creator-ee4bf638cad9bcf303c8c6ad1f922c33dc021964.tar.gz |
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>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp')
-rw-r--r-- | src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index 3d0af0bb6a..d8259a5ef2 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -43,7 +43,7 @@ namespace QmlDesigner { -void QmlObjectNode::setVariantProperty(const QString &name, const QVariant &value) +void QmlObjectNode::setVariantProperty(const PropertyName &name, const QVariant &value) { if (!isValid()) throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); @@ -59,7 +59,7 @@ void QmlObjectNode::setVariantProperty(const QString &name, const QVariant &valu } } -void QmlObjectNode::setBindingProperty(const QString &name, const QString &expression) +void QmlObjectNode::setBindingProperty(const PropertyName &name, const QString &expression) { if (!isValid()) throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); @@ -95,13 +95,13 @@ instanciated instance of this object. \return the value of this property based on the instance */ -QVariant QmlObjectNode::instanceValue(const QString &name) const +QVariant QmlObjectNode::instanceValue(const PropertyName &name) const { return nodeInstance().property(name); } -bool QmlObjectNode::hasProperty(const QString &name) const +bool QmlObjectNode::hasProperty(const PropertyName &name) const { if (!isValid()) throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); @@ -115,7 +115,7 @@ bool QmlObjectNode::hasProperty(const QString &name) const return modelNode().hasProperty(name); } -bool QmlObjectNode::hasBindingProperty(const QString &name) const +bool QmlObjectNode::hasBindingProperty(const PropertyName &name) const { if (!isValid()) throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); @@ -129,22 +129,22 @@ bool QmlObjectNode::hasBindingProperty(const QString &name) const return modelNode().hasBindingProperty(name); } -NodeAbstractProperty QmlObjectNode::nodeAbstractProperty(const QString &name) const +NodeAbstractProperty QmlObjectNode::nodeAbstractProperty(const PropertyName &name) const { return modelNode().nodeAbstractProperty(name); } -NodeProperty QmlObjectNode::nodeProperty(const QString &name) const +NodeProperty QmlObjectNode::nodeProperty(const PropertyName &name) const { return modelNode().nodeProperty(name); } -NodeListProperty QmlObjectNode::nodeListProperty(const QString &name) const +NodeListProperty QmlObjectNode::nodeListProperty(const PropertyName &name) const { return modelNode().nodeListProperty(name); } -bool QmlObjectNode::propertyAffectedByCurrentState(const QString &name) const +bool QmlObjectNode::propertyAffectedByCurrentState(const PropertyName &name) const { if (!isValid()) throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); @@ -158,7 +158,7 @@ bool QmlObjectNode::propertyAffectedByCurrentState(const QString &name) const return currentState().propertyChanges(modelNode()).modelNode().hasProperty(name); } -QVariant QmlObjectNode::modelValue(const QString &name) const +QVariant QmlObjectNode::modelValue(const PropertyName &name) const { if (!isValid()) throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); @@ -177,7 +177,7 @@ QVariant QmlObjectNode::modelValue(const QString &name) const return propertyChanges.modelNode().variantProperty(name).value(); } -QString QmlObjectNode::expression(const QString &name) const +QString QmlObjectNode::expression(const PropertyName &name) const { if (!isValid()) throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); @@ -338,7 +338,7 @@ QList<QmlModelState> QmlObjectNode::allDefinedStates() const */ -void QmlObjectNode::removeVariantProperty(const QString &name) +void QmlObjectNode::removeVariantProperty(const PropertyName &name) { if (!isValid()) throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); @@ -380,7 +380,7 @@ bool QmlObjectNode::isAncestorOf(const QmlObjectNode &objectNode) const return modelNode().isAncestorOf(objectNode.modelNode()); } -QVariant QmlObjectNode::instanceValue(const ModelNode &modelNode, const QString &name) +QVariant QmlObjectNode::instanceValue(const ModelNode &modelNode, const PropertyName &name) { QmlModelView *modelView = qobject_cast<QmlModelView*>(modelNode.view()); if (!modelView) @@ -389,12 +389,12 @@ QVariant QmlObjectNode::instanceValue(const ModelNode &modelNode, const QString return modelView->instanceForModelNode(modelNode).property(name); } -QString QmlObjectNode::instanceType(const QString &name) const +TypeName QmlObjectNode::instanceType(const PropertyName &name) const { return nodeInstance().instanceType(name); } -bool QmlObjectNode::instanceHasBinding(const QString &name) const +bool QmlObjectNode::instanceHasBinding(const PropertyName &name) const { QmlModelView *modelView = qobject_cast<QmlModelView*>(modelNode().view()); if (!modelView) @@ -457,7 +457,7 @@ bool QmlObjectNode::hasDefaultProperty() const return modelNode().metaInfo().hasDefaultProperty(); } -QString QmlObjectNode::defaultProperty() const +PropertyName QmlObjectNode::defaultProperty() const { return modelNode().metaInfo().defaultPropertyName(); } |