diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-13 17:07:44 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:14:08 +0200 |
commit | 9dcc12d52343960400192c817f54a16f7e1f8247 (patch) | |
tree | 24d4b194f6dd2f5b35296dfb8b385f6e714611c0 /src/qml/jsruntime/qv4engine.cpp | |
parent | 19f7850176e95fb181efb45b2c9a5319582a086c (diff) |
Convert a few more methods in ExecutionEngine to use protected pointers
Change-Id: I2e6b1b9dff52bbd16f35a00152c9ac557f8346eb
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, 9 insertions, 9 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 1d3087577d..875ab84cf5 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -418,19 +418,19 @@ ArrayObject *ExecutionEngine::newArrayObject(InternalClass *ic) } -DateObject *ExecutionEngine::newDateObject(const Value &value) +Returned<DateObject> *ExecutionEngine::newDateObject(const Value &value) { DateObject *object = new (memoryManager) DateObject(this, value); - return object; + return object->asReturned<DateObject>(); } -DateObject *ExecutionEngine::newDateObject(const QDateTime &dt) +Returned<DateObject> *ExecutionEngine::newDateObject(const QDateTime &dt) { DateObject *object = new (memoryManager) DateObject(this, dt); - return object; + return object->asReturned<DateObject>(); } -RegExpObject *ExecutionEngine::newRegExpObject(const QString &pattern, int flags) +Returned<RegExpObject> *ExecutionEngine::newRegExpObject(const QString &pattern, int flags) { bool global = (flags & QQmlJS::V4IR::RegExp::RegExp_Global); bool ignoreCase = false; @@ -443,16 +443,16 @@ RegExpObject *ExecutionEngine::newRegExpObject(const QString &pattern, int flags return newRegExpObject(RegExp::create(this, pattern, ignoreCase, multiline), global); } -RegExpObject *ExecutionEngine::newRegExpObject(RegExp* re, bool global) +Returned<RegExpObject> *ExecutionEngine::newRegExpObject(RegExp* re, bool global) { RegExpObject *object = new (memoryManager) RegExpObject(this, re, global); - return object; + return object->asReturned<RegExpObject>(); } -RegExpObject *ExecutionEngine::newRegExpObject(const QRegExp &re) +Returned<RegExpObject> *ExecutionEngine::newRegExpObject(const QRegExp &re) { RegExpObject *object = new (memoryManager) RegExpObject(this, re); - return object; + return object->asReturned<RegExpObject>(); } Object *ExecutionEngine::newErrorObject(const Value &value) |