From a2d115fbaffee282a1d32ed92c6700e6c3dd811b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 12 Sep 2013 22:37:41 +0200 Subject: Convert most remaining return values from Value to ReturnedValue Change-Id: If8b0c3b91be50678693868c10fefc3678008834d Reviewed-by: Simon Hausmann --- src/qml/types/qqmldelegatemodel_p_p.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/qml/types/qqmldelegatemodel_p_p.h') 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; -- cgit v1.2.3