diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-08-08 16:59:32 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-20 14:20:44 +0200 |
commit | e43b6bd9c7a3d584e488cd3c84f9deb2d8955b64 (patch) | |
tree | 0d1a33571d2f75630db3dfe84b1a4ead23f87958 /src/qml/jsruntime/qv4engine.cpp | |
parent | 42b2685d0069e746dee344054831b6f08e482860 (diff) |
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>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 45a289f6db..84ea7ca036 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -515,14 +515,14 @@ Object *ExecutionEngine::newErrorObject(const Value &value) return object; } -Object *ExecutionEngine::newSyntaxErrorObject(ExecutionContext *ctx, DiagnosticMessage *message) +Object *ExecutionEngine::newSyntaxErrorObject(const QString &message) { - return new (memoryManager) SyntaxErrorObject(ctx, message); + return new (memoryManager) SyntaxErrorObject(this, Value::fromString(this, message)); } -Object *ExecutionEngine::newSyntaxErrorObject(const QString &message) +Object *ExecutionEngine::newSyntaxErrorObject(const QString &message, const QString &fileName, int line, int column) { - return new (memoryManager) SyntaxErrorObject(this, message); + return new (memoryManager) SyntaxErrorObject(this, message, fileName, line, column); } @@ -531,9 +531,9 @@ Object *ExecutionEngine::newReferenceErrorObject(const QString &message) return new (memoryManager) ReferenceErrorObject(this, message); } -Object *ExecutionEngine::newReferenceErrorObject(const QString &message, const QString &fileName, int lineNumber) +Object *ExecutionEngine::newReferenceErrorObject(const QString &message, const QString &fileName, int lineNumber, int columnNumber) { - return new (memoryManager) ReferenceErrorObject(this, message, fileName, lineNumber); + return new (memoryManager) ReferenceErrorObject(this, message, fileName, lineNumber, columnNumber); } |