Remove QV4::DiagnosticMessage

QQmlError provides the same functionality, so let's rather
use that where required. Remove the dependency of
codegen onto the ExecutionContext that was only
required for error handling.

Change-Id: Ib0b61c0e138f89ff989c32996c93c339e4b62223
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 3 insertions, 21 deletions

diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h
index 79d43c69f3..bf1269d2dc 100644
--- a/src/qml/jsruntime/qv4context_p.h
+++ b/src/qml/jsruntime/qv4context_p.h
@@ -52,25 +52,6 @@ struct Object;
 struct ExecutionEngine;
 struct DeclarativeEnvironment;
 struct Lookup;
-
-struct Q_QML_EXPORT DiagnosticMessage
-{
-    enum { Error, Warning };
-
-    QString fileName;
-    quint32 offset;
-    quint32 length;
-    quint32 startLine;
-    unsigned startColumn: 31;
-    unsigned type: 1;
-    QString message;
-    DiagnosticMessage *next;
-
-    DiagnosticMessage();
-    ~DiagnosticMessage();
-    String *buildFullMessage(ExecutionContext *ctx) const;
-};
-
 struct CallContext;
 
 struct Q_QML_EXPORT ExecutionContext
@@ -128,11 +109,12 @@ struct Q_QML_EXPORT ExecutionContext
 
     void Q_NORETURN throwError(const Value &value);
     void Q_NORETURN throwError(const QString &message);
-    void Q_NORETURN throwSyntaxError(DiagnosticMessage *message);
+    void Q_NORETURN throwSyntaxError(const QString &message);
+    void Q_NORETURN throwSyntaxError(const QString &message, const QString &fileName, int line, int column);
     void Q_NORETURN throwTypeError();
     void Q_NORETURN throwTypeError(const QString &message);
     void Q_NORETURN throwReferenceError(Value value);
-    void Q_NORETURN throwReferenceError(Value value, const QString &fileName, int line);
+    void Q_NORETURN throwReferenceError(const QString &value, const QString &fileName, int line, int column);
     void Q_NORETURN throwRangeError(Value value);
     void Q_NORETURN throwURIError(Value msg);
     void Q_NORETURN throwUnimplemented(const QString &message);