From 0ae3f86c3a13f7d7818dde2beb2a297234e087ae Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu, 4 Feb 2010 11:08:57 +0100
Subject: [PATCH] Fix building in windows
Reviewed-by: Roberto Raggi
---
src/libs/qmljs/qmljsinterpreter.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/libs/qmljs/qmljsinterpreter.cpp b/src/libs/qmljs/qmljsinterpreter.cpp
index ca317b6801f..b48e28e0bc4 100644
--- a/src/libs/qmljs/qmljsinterpreter.cpp
+++ b/src/libs/qmljs/qmljsinterpreter.cpp
@@ -689,7 +689,7 @@ Context::~Context()
{
}
-void Context::build(AST::Node *node, Document::Ptr doc, const Snapshot &snapshot)
+void Context::build(Node *node, QmlJS::Document::Ptr doc, const QmlJS::Snapshot &snapshot)
{
Link link(this, doc, snapshot);
link.scopeChainAt(doc, node);
@@ -715,12 +715,12 @@ void Context::setLookupMode(LookupMode lookupMode)
_lookupMode = lookupMode;
}
-const ObjectValue *Context::typeEnvironment(const Document *doc) const
+const ObjectValue *Context::typeEnvironment(const QmlJS::Document *doc) const
{
return _typeEnvironments.value(doc, 0);
}
-void Context::setTypeEnvironment(const Document *doc, const ObjectValue *typeEnvironment)
+void Context::setTypeEnvironment(const QmlJS::Document *doc, const ObjectValue *typeEnvironment)
{
_typeEnvironments[doc] = typeEnvironment;
}
@@ -750,7 +750,7 @@ const Value *Context::lookup(const QString &name)
return _engine->undefinedValue();
}
-const ObjectValue *Context::lookupType(const Document *doc, UiQualifiedId *qmlTypeName)
+const ObjectValue *Context::lookupType(const QmlJS::Document *doc, UiQualifiedId *qmlTypeName)
{
const ObjectValue *objectValue = typeEnvironment(doc);
@@ -1999,7 +1999,7 @@ bool ASTFunctionValue::isVariadic() const
return true;
}
-QmlPrototypeReference::QmlPrototypeReference(UiQualifiedId *qmlTypeName, const Document *doc,
+QmlPrototypeReference::QmlPrototypeReference(UiQualifiedId *qmlTypeName, const QmlJS::Document *doc,
Engine *engine)
: Reference(engine),
_qmlTypeName(qmlTypeName),
--
GitLab