From 804d6ceec11e687e4fa821a2b6ceb4223597d0ab Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 25 Nov 2024 10:34:01 +0100 Subject: QmlCompiler: Remove trivial type comparison methods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can compare types without QQmlJSTypeResovler now. Task-number: QTBUG-124670 Change-Id: Id06c8cd5cc8f03683134ad13e02d54ae4da9fae3 Reviewed-by: Olivier De Cannière --- src/qmlcompiler/qqmljsutils.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/qmlcompiler/qqmljsutils.cpp') diff --git a/src/qmlcompiler/qqmljsutils.cpp b/src/qmlcompiler/qqmljsutils.cpp index f40d4932ca..2fc0564edc 100644 --- a/src/qmlcompiler/qqmljsutils.cpp +++ b/src/qmlcompiler/qqmljsutils.cpp @@ -214,8 +214,8 @@ bool canStrictlyCompareWithVar( Q_ASSERT(typeResolver); const QQmlJSScope::ConstPtr varType = typeResolver->varType(); - const bool leftIsVar = typeResolver->equals(lhsType, varType); - const bool righttIsVar = typeResolver->equals(rhsType, varType); + const bool leftIsVar = (lhsType == varType); + const bool righttIsVar = (rhsType == varType); return leftIsVar != righttIsVar; } @@ -230,11 +230,9 @@ bool canCompareWithQObject( { Q_ASSERT(typeResolver); return (lhsType->isReferenceType() - && (rhsType->isReferenceType() - || typeResolver->equals(rhsType, typeResolver->nullType()))) + && (rhsType->isReferenceType() || rhsType == typeResolver->nullType())) || (rhsType->isReferenceType() - && (lhsType->isReferenceType() - || typeResolver->equals(lhsType, typeResolver->nullType()))); + && (lhsType->isReferenceType() || lhsType == typeResolver->nullType())); } /*! \internal @@ -247,8 +245,7 @@ bool canCompareWithQUrl( const QQmlJSScope::ConstPtr &rhsType) { Q_ASSERT(typeResolver); - return typeResolver->equals(lhsType, typeResolver->urlType()) - && typeResolver->equals(rhsType, typeResolver->urlType()); + return lhsType == typeResolver->urlType() && rhsType == typeResolver->urlType(); } static QVarLengthArray resourceFoldersFromBuildFolder(const QString &buildFolder) -- cgit v1.2.3