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

QmlJS: Remove Interpreter namespace.

Browse Source 
The distinction between QmlJS and QmlJS::Interpreter has always been
weak and the extra namespace just added an unnecessary complication.

Change-Id: I4db8ef4bd91b5f6bf610a9d23fdbf55bd60250fc
Reviewed-on: http://codereview.qt.nokia.com/2743
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
This commit is contained in:
Christian Kamm
2011-08-08 12:47:49 +02:00
parent ff092f79b3
commit 0e54183d4d
42 changed files with 308 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/qmljs/qmljsbind.cpp
View File

@@ -44,7 +44,6 @@
using namespace LanguageUtils;
using namespace QmlJS;
using namespace QmlJS::AST;
using namespace QmlJS::Interpreter;
/*!
\class QmlJS::Bind
@@ -54,7 +53,7 @@ using namespace QmlJS::Interpreter;
Each QmlJS::Document owns a instance of Bind. It provides access to data
that can be derived by looking at the document in isolation. If you need
information that goes beyond that, you need to create a
\l{QmlJS::Interpreter::Context} using \l{QmlJS::Link}.
\l{QmlJS::Context} using \l{QmlJS::Link}.
The document's imports are classified and available through imports().
@@ -81,17 +80,17 @@ QList<ImportInfo> Bind::imports() const
return _imports;
}
Interpreter::ObjectValue *Bind::idEnvironment() const
ObjectValue *Bind::idEnvironment() const
{
return _idEnvironment;
}
Interpreter::ObjectValue *Bind::rootObjectValue() const
ObjectValue *Bind::rootObjectValue() const
{
return _rootObjectValue;
}
Interpreter::ObjectValue *Bind::findQmlObject(AST::Node *node) const
ObjectValue *Bind::findQmlObject(AST::Node *node) const
{
return _qmlObjects.value(node);
}
@@ -171,7 +170,7 @@ bool Bind::usesQmlPrototype(ObjectValue *prototype,
return false;
}
Interpreter::ObjectValue *Bind::findAttachedJSScope(AST::Node *node) const
ObjectValue *Bind::findAttachedJSScope(AST::Node *node) const
{
return _attachedJSScopes.value(node);
}
@@ -317,7 +316,7 @@ bool Bind::visit(UiObjectDefinition *ast)
_qmlObjects.insert(ast, value);
} else {
_groupedPropertyBindings.insert(ast);
Interpreter::ObjectValue *oldObjectValue = switchObjectValue(0);
ObjectValue *oldObjectValue = switchObjectValue(0);
accept(ast->initializer);
switchObjectValue(oldObjectValue);
}