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/types/qqmldelegatemodel_p_p.h | |
| 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/types/qqmldelegatemodel_p_p.h')
| -rw-r--r-- | src/qml/types/qqmldelegatemodel_p_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/types/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h index 9b1b64b8db..aa4e0c30e2 100644 --- a/src/qml/types/qqmldelegatemodel_p_p.h +++ b/src/qml/types/qqmldelegatemodel_p_p.h @@ -128,7 +128,7 @@ public: int modelIndex() const { return index; } void setModelIndex(int idx) { index = idx; Q_EMIT modelIndexChanged(); } - virtual QV4::Value get() { return QV4::QObjectWrapper::wrap(v4, this); } + virtual QV4::ReturnedValue get() { return QV4::QObjectWrapper::wrap(v4, this); } virtual void setValue(const QString &role, const QVariant &value) { Q_UNUSED(role); Q_UNUSED(value); } virtual bool resolveIndex(const QQmlAdaptorModel &, int) { return false; } @@ -136,9 +136,9 @@ public: static QV4::ReturnedValue get_model(QV4::SimpleCallContext *ctx); static QV4::ReturnedValue get_groups(QV4::SimpleCallContext *ctx); static QV4::ReturnedValue set_groups(QV4::SimpleCallContext *ctx); - static QV4::Value get_member(QQmlDelegateModelItem *thisItem, uint flag, const QV4::Value &); - static QV4::Value set_member(QQmlDelegateModelItem *thisItem, uint flag, const QV4::Value &arg); - static QV4::Value get_index(QQmlDelegateModelItem *thisItem, uint flag, const QV4::Value &arg); + static QV4::ReturnedValue get_member(QQmlDelegateModelItem *thisItem, uint flag, const QV4::Value &); + static QV4::ReturnedValue set_member(QQmlDelegateModelItem *thisItem, uint flag, const QV4::Value &arg); + static QV4::ReturnedValue get_index(QQmlDelegateModelItem *thisItem, uint flag, const QV4::Value &arg); QV4::ExecutionEngine *v4; QQmlDelegateModelItemMetaType * const metaType; |