QmlJS: Enforce Context always being linked.

The default way of creating a Context is through Link.

Change-Id: Ia81f7ce90ba2b33d02eed432a61be836d404bedd
Reviewed-on: http://codereview.qt.nokia.com/1041
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/src/libs/qmljs/qmljslink.h b/src/libs/qmljs/qmljslink.h
index 218f22d10f..bbd8bd2e30 100644
--- a/src/libs/qmljs/qmljslink.h
+++ b/src/libs/qmljs/qmljslink.h
@@ -34,7 +34,7 @@
 #define QMLJSLINK_H
 
 #include <qmljs/qmljsdocument.h>
-#include <qmljs/qmljsinterpreter.h>
+#include <qmljs/qmljsvalueowner.h>
 #include <qmljs/parser/qmljsastfwd_p.h>
 #include <languageutils/componentversion.h>
 
@@ -54,21 +54,18 @@ class QMLJS_EXPORT Link
     Q_DECLARE_TR_FUNCTIONS(QmlJS::Link)
 
 public:
-    Link(Interpreter::Context *context, const Snapshot &snapshot,
-         const QStringList &importPaths);
+    Link(const Snapshot &snapshot, const QStringList &importPaths);
 
     // Link all documents in snapshot, collecting all diagnostic messages (if messages != 0)
-    void operator()(QHash<QString, QList<DiagnosticMessage> > *messages = 0);
+    Interpreter::Context operator()(QHash<QString, QList<DiagnosticMessage> > *messages = 0);
 
     // Link all documents in snapshot, appending the diagnostic messages
     // for 'doc' in 'messages'
-    void operator()(const Document::Ptr &doc, QList<DiagnosticMessage> *messages);
+    Interpreter::Context operator()(const Document::Ptr &doc, QList<DiagnosticMessage> *messages);
 
     ~Link();
 
 private:
-    Interpreter::ValueOwner *valueOwner();
-
     static AST::UiQualifiedId *qualifiedTypeNameId(AST::Node *node);
 
     void linkImports();