From 3f0c9122c5971090d0256bda4e9fb53da4a76ea0 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Tue, 24 Mar 2020 18:21:15 +0100
Subject: Encapsulate QV4::ResolvedTypeReference

It's used all over the place. We need a proper interface.

Change-Id: Iebe254ef3bf35503bf3fdd3639979a5db2b3449e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/qmltest/quicktest.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/qmltest/quicktest.cpp')

diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp
index 96a5c20f22..b2f54d978f 100644
--- a/src/qmltest/quicktest.cpp
+++ b/src/qmltest/quicktest.cpp
@@ -70,7 +70,7 @@
 #include <QtQml/QQmlFileSelector>
 
 #include <private/qqmlcomponent_p.h>
-#include <private/qv4executablecompilationunit_p.h>
+#include <private/qv4resolvedtypereference_p.h>
 
 #ifdef QT_QMLTEST_WITH_WIDGETS
 #include <QtWidgets/QApplication>
@@ -332,8 +332,9 @@ private:
         }
     };
 
-    TestCaseEnumerationResult enumerateTestCases(QV4::ExecutableCompilationUnit *compilationUnit,
-                                                 const Object *object = nullptr)
+    TestCaseEnumerationResult enumerateTestCases(
+            const QQmlRefPointer<QV4::ExecutableCompilationUnit> &compilationUnit,
+            const Object *object = nullptr)
     {
         QQmlType testCaseType;
         for (quint32 i = 0, count = compilationUnit->importCount(); i < count; ++i) {
@@ -356,9 +357,8 @@ private:
         if (!object) // Start at root of compilation unit if not enumerating a specific child
             object = compilationUnit->objectAt(0);
 
-        if (QV4::ExecutableCompilationUnit *superTypeUnit
-            = compilationUnit->resolvedTypes.value(object->inheritedTypeNameIndex)
-                      ->compilationUnit.data()) {
+        if (const auto superTypeUnit = compilationUnit->resolvedTypes.value(
+                    object->inheritedTypeNameIndex)->compilationUnit()) {
             // We have a non-C++ super type, which could indicate we're a subtype of a TestCase
             if (testCaseType.isValid() && superTypeUnit->url() == testCaseType.sourceUrl())
                 result.isTestCase = true;
-- 
cgit v1.2.3