diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-11 13:34:18 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-12 17:55:57 +0100 |
commit | faf13a3aa0c97b7386e44d02f323a9156a733c9f (patch) | |
tree | ee3741b0724f52c3c1e66cd8963022fc877ab3b8 /src/qml/jsruntime/qv4engine_p.h | |
parent | 9bad6eea0f30f6a6c1878c2773dc39071cb41584 (diff) |
Ported most ExecutionEnginew::new* factory methods away from Returned<T>
We don't need Returned<T> anymore with the QV4:: vs. Heap:: separation.
Eliminating Returned<T> simplifies also some code.
Change-Id: Ic2a9cd3c1a94f2ea37b539d3984d63997121c2b9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4engine_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4engine_p.h | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h index 203bfdb90c..5e2a6cb50b 100644 --- a/src/qml/jsruntime/qv4engine_p.h +++ b/src/qml/jsruntime/qv4engine_p.h @@ -305,41 +305,41 @@ public: void pushContext(CallContext *context); ExecutionContext *popContext(); - Returned<Object> *newObject(); - Returned<Object> *newObject(InternalClass *internalClass); + Heap::Object *newObject(); + Heap::Object *newObject(InternalClass *internalClass); Returned<String> *newString(const QString &s); String *newIdentifier(const QString &text); - Returned<Object> *newStringObject(const ValueRef value); - Returned<Object> *newNumberObject(const ValueRef value); - Returned<Object> *newBooleanObject(const ValueRef value); + Heap::Object *newStringObject(const ValueRef value); + Heap::Object *newNumberObject(const ValueRef value); + Heap::Object *newBooleanObject(const ValueRef value); - Returned<ArrayObject> *newArrayObject(int count = 0); - Returned<ArrayObject> *newArrayObject(const QStringList &list); - Returned<ArrayObject> *newArrayObject(InternalClass *ic); + Heap::ArrayObject *newArrayObject(int count = 0); + Heap::ArrayObject *newArrayObject(const QStringList &list); + Heap::ArrayObject *newArrayObject(InternalClass *ic); - Returned<DateObject> *newDateObject(const ValueRef value); - Returned<DateObject> *newDateObject(const QDateTime &dt); + Heap::DateObject *newDateObject(const ValueRef value); + Heap::DateObject *newDateObject(const QDateTime &dt); - Returned<RegExpObject> *newRegExpObject(const QString &pattern, int flags); - Returned<RegExpObject> *newRegExpObject(RegExp *re, bool global); - Returned<RegExpObject> *newRegExpObject(const QRegExp &re); + Heap::RegExpObject *newRegExpObject(const QString &pattern, int flags); + Heap::RegExpObject *newRegExpObject(RegExp *re, bool global); + Heap::RegExpObject *newRegExpObject(const QRegExp &re); - Returned<Object> *newErrorObject(const ValueRef value); - Returned<Object> *newSyntaxErrorObject(const QString &message, const QString &fileName, int line, int column); - Returned<Object> *newSyntaxErrorObject(const QString &message); - Returned<Object> *newReferenceErrorObject(const QString &message); - Returned<Object> *newReferenceErrorObject(const QString &message, const QString &fileName, int lineNumber, int columnNumber); - Returned<Object> *newTypeErrorObject(const QString &message); - Returned<Object> *newRangeErrorObject(const QString &message); - Returned<Object> *newURIErrorObject(const ValueRef message); + Heap::Object *newErrorObject(const ValueRef value); + Heap::Object *newSyntaxErrorObject(const QString &message, const QString &fileName, int line, int column); + Heap::Object *newSyntaxErrorObject(const QString &message); + Heap::Object *newReferenceErrorObject(const QString &message); + Heap::Object *newReferenceErrorObject(const QString &message, const QString &fileName, int lineNumber, int columnNumber); + Heap::Object *newTypeErrorObject(const QString &message); + Heap::Object *newRangeErrorObject(const QString &message); + Heap::Object *newURIErrorObject(const ValueRef message); - Returned<Object> *newVariantObject(const QVariant &v); + Heap::Object *newVariantObject(const QVariant &v); - Returned<Object> *newForEachIteratorObject(Object *o); + Heap::Object *newForEachIteratorObject(Object *o); - Returned<Object> *qmlContextObject() const; + Heap::Object *qmlContextObject() const; StackTrace stackTrace(int frameLimit = -1) const; StackFrame currentStackFrame() const; |