From 347a29ff5cc2bde63863cf8657c64b4d13f52406 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 3 Oct 2018 08:47:04 +0200 Subject: Replace more vestiges of VisualDataModel, *Group and VisualItemModel VisualDataModel, VisualDataGroup, and VisualItemModel are replaced with DelegateModel, DelegateModelGroup, and ObjectModel respectively (since 7cad0e52c5a020bd29635e9912fd8946a6b48124), so shouldn't be mentioned anymore, in preparation for removal. Task-number: QTBUG-37725 Change-Id: I9a01ec8db748f817efca638383b7a278c7b562cd Reviewed-by: Mitch Curtis Reviewed-by: Venugopal Shivashankar --- src/qml/types/qqmldelegatemodel.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/qml/types') diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index f6bf4a6647..243a7ce749 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -103,7 +103,7 @@ struct DelegateModelGroupFunction : QV4::FunctionObject QV4::Scoped f(scope, static_cast(that)); QV4::Scoped o(scope, thisObject); if (!o) - return scope.engine->throwTypeError(QStringLiteral("Not a valid VisualData object")); + return scope.engine->throwTypeError(QStringLiteral("Not a valid DelegateModel object")); QV4::ScopedValue v(scope, argc ? argv[0] : Value::undefinedValue()); return f->d()->code(o->d()->item, f->d()->flag, v); @@ -1936,7 +1936,7 @@ QV4::ReturnedValue QQmlDelegateModelItem::get_model(const QV4::FunctionObject *b QV4::Scope scope(b); QV4::Scoped o(scope, thisObject->as()); if (!o) - return b->engine()->throwTypeError(QStringLiteral("Not a valid VisualData object")); + return b->engine()->throwTypeError(QStringLiteral("Not a valid DelegateModel object")); if (!o->d()->item->metaType->model) RETURN_UNDEFINED(); @@ -1948,7 +1948,7 @@ QV4::ReturnedValue QQmlDelegateModelItem::get_groups(const QV4::FunctionObject * QV4::Scope scope(b); QV4::Scoped o(scope, thisObject->as()); if (!o) - return scope.engine->throwTypeError(QStringLiteral("Not a valid VisualData object")); + return scope.engine->throwTypeError(QStringLiteral("Not a valid DelegateModel object")); QStringList groups; for (int i = 1; i < o->d()->item->metaType->groupCount; ++i) { @@ -1964,7 +1964,7 @@ QV4::ReturnedValue QQmlDelegateModelItem::set_groups(const QV4::FunctionObject * QV4::Scope scope(b); QV4::Scoped o(scope, thisObject->as()); if (!o) - return scope.engine->throwTypeError(QStringLiteral("Not a valid VisualData object")); + return scope.engine->throwTypeError(QStringLiteral("Not a valid DelegateModel object")); if (!argc) THROW_TYPE_ERROR(); -- cgit v1.2.3