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

Initalize the members of the binder.

Browse Source
This commit is contained in:
Roberto Raggi
2010-01-26 15:51:31 +01:00
parent 138221ac24
commit 02ee76b82a
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,14 @@ using namespace QmlJS;
using namespace QmlJS::AST;
using namespace QmlJS::Interpreter;
Bind::Bind()
Bind::Bind(Interpreter::Engine *interp)
: _interp(interp),
_interestingMember(0),
_currentObjectValue(0),
_typeEnvironment(0),
_idEnvironment(0),
_interestingObjectValue(0),
_rootObjectValue(0)
{
}
@@ -43,20 +50,19 @@ Bind::~Bind()
{
}
Interpreter::ObjectValue *Bind::operator()(Document::Ptr doc, Snapshot &snapshot, UiObjectMember *member, Interpreter::Engine &interp)
Interpreter::ObjectValue *Bind::operator()(Document::Ptr doc, const Snapshot &snapshot, UiObjectMember *member)
{
UiProgram *program = doc->qmlProgram();
if (!program)
return 0;
_doc = doc;
_snapshot = &snapshot;
_snapshot = snapshot;
_interestingMember = member;
_interp = &interp;
_currentObjectValue = 0;
_typeEnvironment = _interp->newObject(0);
_idEnvironment = _interp->newObject(0);
_typeEnvironment = _interp->newObject(/*prototype =*/ 0);
_idEnvironment = _interp->newObject(/*prototype =*/ 0);
_interestingObjectValue = 0;
_rootObjectValue = 0;

8
src/libs/qmljs/qmljsbind.h
View File

@@ -39,10 +39,10 @@ namespace QmlJS {
class QMLJS_EXPORT Bind: protected AST::Visitor
{
public:
Bind();
Bind(Interpreter::Engine *interp);
virtual ~Bind();
Interpreter::ObjectValue* operator()(Document::Ptr doc, Snapshot &snapshot, AST::UiObjectMember *member, Interpreter::Engine &interp);
Interpreter::ObjectValue* operator()(Document::Ptr doc, const Snapshot &snapshot, AST::UiObjectMember *member);
protected:
void accept(AST::Node *node);
@@ -148,9 +148,9 @@ protected:
private:
Document::Ptr _doc;
Snapshot *_snapshot;
AST::UiObjectMember *_interestingMember;
Snapshot _snapshot;
Interpreter::Engine *_interp;
AST::UiObjectMember *_interestingMember;
Interpreter::ObjectValue *_currentObjectValue;

6
src/plugins/qmljseditor/qmlcodecompletion.cpp
View File

@@ -96,6 +96,7 @@ static QIcon iconForColor(const QColor &color)
}
#if 0
static QString qualifiedNameId(AST::UiQualifiedId *it)
{
QString text;
@@ -113,7 +114,6 @@ static QString qualifiedNameId(AST::UiQualifiedId *it)
return text;
}
#if 0
static Interpreter::ObjectValue *newComponent(Interpreter::Engine *engine, const QString &name,
const QHash<QString, Document::Ptr> &userComponents,
QSet<QString> *processed)
@@ -821,8 +821,8 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
scope->setProperty(QLatin1String("parent"), parentItem);
#endif
Bind bind;
scope = bind(qmlDocument, snapshot, declaringMember, interp);
Bind bind(&interp);
scope = bind(qmlDocument, snapshot, declaringMember);
}
// Search for the operator that triggered the completion.