diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-12 22:37:41 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:55 +0200 |
| commit | a2d115fbaffee282a1d32ed92c6700e6c3dd811b (patch) | |
| tree | 7694e53751edd605d99d1d8eb19c9cd5d6d8188a /src/qml/jsruntime/qv4include.cpp | |
| parent | 399f88f6b75bb842be8e9d3671ace5114e115542 (diff) | |
Convert most remaining return values from Value to ReturnedValue
Change-Id: If8b0c3b91be50678693868c10fefc3678008834d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4include.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4include.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp index 43e566b5fb..ac9a50c3a1 100644 --- a/src/qml/jsruntime/qv4include.cpp +++ b/src/qml/jsruntime/qv4include.cpp @@ -82,7 +82,7 @@ QV4Include::~QV4Include() delete m_reply; m_reply = 0; } -QV4::Value QV4Include::resultValue(QV4::ExecutionEngine *v4, Status status) +QV4::ReturnedValue QV4Include::resultValue(QV4::ExecutionEngine *v4, Status status) { // XXX It seems inefficient to create this object from scratch each time. @@ -94,7 +94,7 @@ QV4::Value QV4Include::resultValue(QV4::ExecutionEngine *v4, Status status) o->put(v4->newString("status"), QV4::Value::fromInt32(status)); - return QV4::Value::fromObject(o); + return QV4::Value::fromObject(o).asReturnedValue(); } void QV4Include::callback(const QV4::Value &callback, const QV4::Value &status) @@ -115,9 +115,9 @@ void QV4Include::callback(const QV4::Value &callback, const QV4::Value &status) } } -QV4::Value QV4Include::result() +QV4::ReturnedValue QV4Include::result() { - return m_resultObject.value(); + return m_resultObject.value().asReturnedValue(); } #define INCLUDE_MAXIMUM_REDIRECT_RECURSION 15 |