diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-10-01 16:11:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-02 16:07:33 +0200 |
| commit | c1d66eec1dbaf9034e03e3efa0403a774c764373 (patch) | |
| tree | fa185761604cc636e77ff5f4eda2462783bc18e6 /src/qml/qml | |
| parent | d49cc03df130353665edd89112fd4e1f3cdab9b6 (diff) | |
Cleanup API of Safe<T>
Don't have an implicit cast operator to Returned<T>
anymore, and return a T* from the operator->()
Change-Id: If4165071b986bfc84a157560d94d39c2dcfbc9e1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmllistwrapper.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlxmlhttprequest.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmllistwrapper.cpp b/src/qml/qml/qqmllistwrapper.cpp index de4fbbb408..c1ec5dc1c1 100644 --- a/src/qml/qml/qqmllistwrapper.cpp +++ b/src/qml/qml/qqmllistwrapper.cpp @@ -107,7 +107,7 @@ ReturnedValue QmlListWrapper::get(Managed *m, const StringRef name, bool *hasPro if (!w) v4->current->throwTypeError(); - if (name->isEqualTo(v4->id_length) && !w->object.isNull()) { + if (name->equals(v4->id_length) && !w->object.isNull()) { quint32 count = w->property.count ? w->property.count(&w->property) : 0; return Primitive::fromUInt32(count).asReturnedValue(); } diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index 3097031765..2b9bd6196f 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -925,7 +925,7 @@ ReturnedValue NamedNodeMap::get(Managed *m, const StringRef name, bool *hasPrope v4->current->throwTypeError(); name->makeIdentifier(); - if (name->isEqualTo(v4->id_length)) + if (name->equals(v4->id_length)) return Primitive::fromInt32(r->list.count()).asReturnedValue(); QV8Engine *engine = v4->v8Engine; @@ -981,7 +981,7 @@ ReturnedValue NodeList::get(Managed *m, const StringRef name, bool *hasProperty) name->makeIdentifier(); - if (name->isEqualTo(v4->id_length)) + if (name->equals(v4->id_length)) return Primitive::fromInt32(r->d->children.count()).asReturnedValue(); return Object::get(m, name, hasProperty); } |