diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-13 21:54:21 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:14:10 +0200 |
commit | e4e90923c93adfafb23c81be7359e8df2a500b4f (patch) | |
tree | 36be927b72606c4f37326089ff3c6261f484c92b /src/qml/jsruntime/qv4engine.cpp | |
parent | 9dcc12d52343960400192c817f54a16f7e1f8247 (diff) |
Convert some methods to use Returned<>
Change-Id: I631606cb5ab3b35b72104e70092a5200dd235fbc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 875ab84cf5..0187099f62 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -375,10 +375,10 @@ String *ExecutionEngine::newIdentifier(const QString &text) return identifierTable->insertString(text); } -Object *ExecutionEngine::newStringObject(const Value &value) +Returned<Object> *ExecutionEngine::newStringObject(const Value &value) { StringObject *object = new (memoryManager) StringObject(this, value); - return object; + return object->asReturned<Object>(); } Returned<Object> *ExecutionEngine::newNumberObject(const Value &value) @@ -455,20 +455,22 @@ Returned<RegExpObject> *ExecutionEngine::newRegExpObject(const QRegExp &re) return object->asReturned<RegExpObject>(); } -Object *ExecutionEngine::newErrorObject(const Value &value) +Returned<Object> *ExecutionEngine::newErrorObject(const Value &value) { ErrorObject *object = new (memoryManager) ErrorObject(errorClass, value); - return object; + return object->asReturned<Object>(); } -Object *ExecutionEngine::newSyntaxErrorObject(const QString &message) +Returned<Object> *ExecutionEngine::newSyntaxErrorObject(const QString &message) { - return new (memoryManager) SyntaxErrorObject(this, Value::fromString(this, message)); + Object *error = new (memoryManager) SyntaxErrorObject(this, Value::fromString(this, message)); + return error->asReturned<Object>(); } -Object *ExecutionEngine::newSyntaxErrorObject(const QString &message, const QString &fileName, int line, int column) +Returned<Object> *ExecutionEngine::newSyntaxErrorObject(const QString &message, const QString &fileName, int line, int column) { - return new (memoryManager) SyntaxErrorObject(this, message, fileName, line, column); + Object *error = new (memoryManager) SyntaxErrorObject(this, message, fileName, line, column); + return error->asReturned<Object>(); } |