From 483d09779c2719415c5ac421074a1af3bd66ca29 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Fri, 5 Mar 2021 11:30:18 +0100 Subject: Remove QQmlEnginePrivate::isQObject The only caller has a QMetaType available and can query that one. This leads to subsequent cleanups in QQmlListAccessor::setList and QQmlAdaptorModel::setModel which now no longer have a need to pass the QQmlEngine along. Task-number: QTBUG-82931 Change-Id: I6f38892a3a5098f07bc21f4eebcca82cf52a6838 Reviewed-by: Ulf Hermann --- src/qmlmodels/qqmllistaccessor.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/qmlmodels/qqmllistaccessor.cpp') diff --git a/src/qmlmodels/qqmllistaccessor.cpp b/src/qmlmodels/qqmllistaccessor.cpp index 1e67d03f74..60b91a23c9 100644 --- a/src/qmlmodels/qqmllistaccessor.cpp +++ b/src/qmlmodels/qqmllistaccessor.cpp @@ -63,7 +63,7 @@ QVariant QQmlListAccessor::list() const return d; } -void QQmlListAccessor::setList(const QVariant &v, QQmlEngine *engine) +void QQmlListAccessor::setList(const QVariant &v) { d = v; @@ -71,9 +71,6 @@ void QQmlListAccessor::setList(const QVariant &v, QQmlEngine *engine) // convert it first with toVariant(). if (d.userType() == qMetaTypeId()) d = d.value().toVariant(); - - QQmlEnginePrivate *enginePrivate = engine?QQmlEnginePrivate::get(engine):nullptr; - if (!d.isValid()) { m_type = Invalid; } else if (d.userType() == QMetaType::QStringList) { @@ -103,8 +100,7 @@ void QQmlListAccessor::setList(const QVariant &v, QQmlEngine *engine) } else { m_type = Integer; } - } else if ((!enginePrivate && QQmlMetaType::isQObject(d.userType())) || - (enginePrivate && enginePrivate->isQObject(d.userType()))) { + } else if (d.metaType().flags().testFlag(QMetaType::PointerToQObject)) { QObject *data = QQmlMetaType::toQObject(d); d = QVariant::fromValue(data); m_type = Instance; -- cgit v1.2.3