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/qqmltypecompiler_p.h b/src/qml/qml/qqmltypecompiler_p.h
index f588909c42..615694d4bc 100644
--- a/src/qml/qml/qqmltypecompiler_p.h
+++ b/src/qml/qml/qqmltypecompiler_p.h
@@ -97,9 +97,8 @@ public:
     QQmlRefPointer<QV4::ExecutableCompilationUnit> compile();
 
     QList<QQmlError> compilationErrors() const { return errors; }
-    void recordError(QQmlError error);
     void recordError(const QV4::CompiledData::Location &location, const QString &description);
-    void recordError(const QQmlCompileError &error);
+    void recordError(const QQmlJS::DiagnosticMessage &error);
 
     int registerString(const QString &str);
     int registerConstant(QV4::ReturnedValue v);
@@ -153,7 +152,7 @@ struct QQmlCompilePass
 protected:
     void recordError(const QV4::CompiledData::Location &location, const QString &description) const
     { compiler->recordError(location, description); }
-    void recordError(const QQmlCompileError &error)
+    void recordError(const QQmlJS::DiagnosticMessage &error)
     { compiler->recordError(error); }
 
     QV4::ResolvedTypeReference *resolvedType(int id) const
@@ -276,7 +275,7 @@ protected:
         AllAliasesResolved
     };
 
-    AliasResolutionResult resolveAliasesInObject(int objectIndex, QQmlCompileError *error);
+    AliasResolutionResult resolveAliasesInObject(int objectIndex, QQmlJS::DiagnosticMessage *error);
 
     QQmlEnginePrivate *enginePrivate;
     QQmlJS::MemoryPool *pool;