feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Enforce Context always being linked.

Browse Source 
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>
This commit is contained in:
Christian Kamm
2011-07-01 13:41:40 +02:00
parent f691d3824a
commit 9ea0380a4d
8 changed files with 50 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/qmljs/qmljsinterpreter.cpp
View File

@@ -779,9 +779,10 @@ QList<const ObjectValue *> ScopeChain::all() const
}
Context::Context(const QmlJS::Snapshot &snapshot)
Context::Context(const QmlJS::Snapshot &snapshot, ValueOwner *valueOwner, const ImportsPerDocument &imports)
: _snapshot(snapshot),
_valueOwner(new ValueOwner),
_valueOwner(valueOwner),
_imports(imports),
_qmlScopeObjectIndex(-1),
_qmlScopeObjectSet(false)
{
@@ -819,13 +820,6 @@ const Imports *Context::imports(const QmlJS::Document *doc) const
return _imports.value(doc).data();
}
void Context::setImports(const QmlJS::Document *doc, const Imports *imports)
{
if (!doc)
return;
_imports[doc] = QSharedPointer<const Imports>(imports);
}
const Value *Context::lookup(const QString &name, const ObjectValue **foundInScope) const
{
QList<const ObjectValue *> scopes = _scopeChain.all();