diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-11 17:27:49 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-14 13:00:51 +0100 |
| commit | 353402344d0bbf20bc0003324ab6e8d7f67ee90d (patch) | |
| tree | 2ca98c94c37ed26cd9b94c03a92913f0bafac840 /src/qml/types | |
| parent | afbf1f74af678af0eda76035133406aa8883408a (diff) | |
Replaced more usages of Returned<T> with Heap::T*
Change-Id: I451128ee71610bfeb71139c28da89a00a8209ec6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index 383379295f..be99c56076 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -81,9 +81,9 @@ struct DelegateModelGroupFunction : QV4::FunctionObject { V4_OBJECT2(DelegateModelGroupFunction, FunctionObject) - static QV4::Returned<DelegateModelGroupFunction> *create(QV4::ExecutionContext *scope, uint flag, QV4::ReturnedValue (*code)(QQmlDelegateModelItem *item, uint flag, const QV4::ValueRef arg)) + static Heap::DelegateModelGroupFunction *create(QV4::ExecutionContext *scope, uint flag, QV4::ReturnedValue (*code)(QQmlDelegateModelItem *item, uint flag, const QV4::ValueRef arg)) { - return scope->engine()->memoryManager->alloc<DelegateModelGroupFunction>(scope, flag, code); + return scope->engine()->memoryManager->alloc<DelegateModelGroupFunction>(scope, flag, code)->getPointer()->d(); } static QV4::ReturnedValue construct(QV4::Managed *m, QV4::CallData *) @@ -3236,8 +3236,8 @@ struct QQmlDelegateModelGroupChange : QV4::Object { V4_OBJECT2(QQmlDelegateModelGroupChange, QV4::Object) - static QV4::Returned<QQmlDelegateModelGroupChange> *create(QV4::ExecutionEngine *e) { - return e->memoryManager->alloc<QQmlDelegateModelGroupChange>(e); + static QV4::Heap::QQmlDelegateModelGroupChange *create(QV4::ExecutionEngine *e) { + return e->memoryManager->alloc<QQmlDelegateModelGroupChange>(e)->getPointer()->d(); } static QV4::ReturnedValue method_get_index(QV4::CallContext *ctx) { @@ -3277,9 +3277,9 @@ struct QQmlDelegateModelGroupChangeArray : public QV4::Object { V4_OBJECT2(QQmlDelegateModelGroupChangeArray, QV4::Object) public: - static QV4::Returned<QQmlDelegateModelGroupChangeArray> *create(QV4::ExecutionEngine *engine, const QVector<QQmlChangeSet::Change> &changes) + static QV4::Heap::QQmlDelegateModelGroupChangeArray *create(QV4::ExecutionEngine *engine, const QVector<QQmlChangeSet::Change> &changes) { - return engine->memoryManager->alloc<QQmlDelegateModelGroupChangeArray>(engine, changes); + return engine->memoryManager->alloc<QQmlDelegateModelGroupChangeArray>(engine, changes)->getPointer()->d(); } quint32 count() const { return d()->changes.count(); } |