Simplify errors and diagnostics

We only need two classes to describe all possible diagnostics:

* A low-level private POD DiagnosticMessage. This is easily copied and
  passed around internally. It doesn't need to adhere to a stable API
  and it doesn't carry any extra baggage.

* The high-level public QQmlError with its stable interface. This can
  internally also use a DiagnosticMessage as storage.

Change-Id: I52be88d9b5d9855a661b8032b01eedb43a0fb0b3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 
 
 

1 files changed, 3 insertions, 4 deletions

diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index d87812d48e..3330d52e56 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -86,7 +86,6 @@ class QQmlTypeData;
 class QQmlTypeLoader;
 class QQmlExtensionInterface;
 class QQmlProfiler;
-struct QQmlCompileError;
 
 namespace QmlIR {
 struct Document;
@@ -154,8 +153,8 @@ protected:
     // Can be called from within callbacks
     void setError(const QQmlError &);
     void setError(const QList<QQmlError> &errors);
-    void setError(const QQmlCompileError &error);
-    void setError(const QVector<QQmlCompileError> &errors);
+    void setError(const QQmlJS::DiagnosticMessage &error);
+    void setError(const QVector<QQmlJS::DiagnosticMessage> &errors);
     void setError(const QString &description);
     void addDependency(QQmlDataBlob *);
 
@@ -481,7 +480,7 @@ private:
     void restoreIR(QV4::CompiledData::CompilationUnit &&unit);
     void continueLoadFromIR();
     void resolveTypes();
-    QQmlCompileError buildTypeResolutionCaches(
+    QQmlJS::DiagnosticMessage buildTypeResolutionCaches(
             QQmlRefPointer<QQmlTypeNameCache> *typeNameCache,
             QV4::ResolvedTypeReferenceMap *resolvedTypeCache
             ) const;