1 files changed, 20 insertions, 52 deletions

diff --git a/src/qml/qml/qqmlpropertyvalidator_p.h b/src/qml/qml/qqmlpropertyvalidator_p.h
index 74a1281927..75787fcf68 100644
--- a/src/qml/qml/qqmlpropertyvalidator_p.h
+++ b/src/qml/qml/qqmlpropertyvalidator_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 #ifndef QQMLPROPERTYVALIDATOR_P_H
 #define QQMLPROPERTYVALIDATOR_P_H
 
@@ -64,27 +28,31 @@ class QQmlPropertyValidator
 {
     Q_DECLARE_TR_FUNCTIONS(QQmlPropertyValidator)
 public:
-    QQmlPropertyValidator(QQmlEnginePrivate *enginePrivate, const QQmlImports &imports, const QQmlRefPointer<QV4::ExecutableCompilationUnit> &compilationUnit);
+    QQmlPropertyValidator(
+            QQmlEnginePrivate *enginePrivate, const QQmlImports *imports,
+            const QQmlRefPointer<QV4::CompiledData::CompilationUnit> &compilationUnit);
 
-    QVector<QQmlJS::DiagnosticMessage> validate();
+    QVector<QQmlError> validate();
+
+    QQmlPropertyCache::ConstPtr rootPropertyCache() const { return propertyCaches.at(0); }
+    QUrl documentSourceUrl() const { return compilationUnit->url(); }
 
 private:
-    QVector<QQmlJS::DiagnosticMessage> validateObject(
+    QVector<QQmlError> validateObject(
             int objectIndex, const QV4::CompiledData::Binding *instantiatingBinding,
             bool populatingValueTypeGroupProperty = false) const;
-    QQmlJS::DiagnosticMessage validateLiteralBinding(
-            QQmlPropertyCache *propertyCache, QQmlPropertyData *property,
+    QQmlError validateLiteralBinding(
+            const QQmlPropertyCache::ConstPtr &propertyCache, const QQmlPropertyData *property,
             const QV4::CompiledData::Binding *binding) const;
-    QQmlJS::DiagnosticMessage validateObjectBinding(
-            QQmlPropertyData *property, const QString &propertyName,
+    QQmlError validateObjectBinding(
+            const QQmlPropertyData *property, const QString &propertyName,
             const QV4::CompiledData::Binding *binding) const;
 
-    bool canCoerce(int to, QQmlPropertyCache *fromMo) const;
+    bool canCoerce(QMetaType to, QQmlPropertyCache::ConstPtr fromMo) const;
 
-    Q_REQUIRED_RESULT QVector<QQmlJS::DiagnosticMessage> recordError(
+    Q_REQUIRED_RESULT QVector<QQmlError> recordError(
             const QV4::CompiledData::Location &location, const QString &description) const;
-    Q_REQUIRED_RESULT QVector<QQmlJS::DiagnosticMessage> recordError(
-            const QQmlJS::DiagnosticMessage &error) const;
+    Q_REQUIRED_RESULT QVector<QQmlError> recordError(const QQmlError &error) const;
     QString stringAt(int index) const { return compilationUnit->stringAt(index); }
     QV4::ResolvedTypeReference *resolvedType(int id) const
     {
@@ -92,12 +60,12 @@ private:
     }
 
     QQmlEnginePrivate *enginePrivate;
-    QQmlRefPointer<QV4::ExecutableCompilationUnit> compilationUnit;
-    const QQmlImports &imports;
+    QQmlRefPointer<QV4::CompiledData::CompilationUnit> compilationUnit;
+    const QQmlImports *imports;
     const QV4::CompiledData::Unit *qmlUnit;
     const QQmlPropertyCacheVector &propertyCaches;
 
-    QVector<QV4::BindingPropertyData> * const bindingPropertyDataPerObject;
+    QVector<QV4::CompiledData::BindingPropertyData> * const bindingPropertyDataPerObject;
 };
 
 QT_END_NAMESPACE