summaryrefslogtreecommitdiff
path: root/src/libs/qmljs/qmljsscopebuilder.cpp
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2011-09-13 09:57:24 +0200
committerChristian Kamm <christian.d.kamm@nokia.com>2011-09-14 11:48:22 +0200
commit4b2f42cf8742d281bd107637044dd0e74bfa4224 (patch)
tree8ea8056c37aee5aa500aa79c702e0d9e4306f027 /src/libs/qmljs/qmljsscopebuilder.cpp
parentb5312090028a338ac3f945f8692cadde7eb2172b (diff)
downloadqt-creator-4b2f42cf8742d281bd107637044dd0e74bfa4224.tar.gz
QmlJS: Adjust existing code for updated QML parser.
Change-Id: I153723eeb9973be025daf47e317f7b9d076a3c72 Reviewed-on: http://codereview.qt-project.org/4733 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Diffstat (limited to 'src/libs/qmljs/qmljsscopebuilder.cpp')
-rw-r--r--src/libs/qmljs/qmljsscopebuilder.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/qmljs/qmljsscopebuilder.cpp b/src/libs/qmljs/qmljsscopebuilder.cpp
index f7e78f35e9..0e455da1d7 100644
--- a/src/libs/qmljs/qmljsscopebuilder.cpp
+++ b/src/libs/qmljs/qmljsscopebuilder.cpp
@@ -175,8 +175,8 @@ void ScopeBuilder::setQmlScopeObject(Node *node)
if (initializer) {
for (UiObjectMemberList *m = initializer->members; m; m = m->next) {
if (UiScriptBinding *scriptBinding = cast<UiScriptBinding *>(m->member)) {
- if (scriptBinding->qualifiedId && scriptBinding->qualifiedId->name
- && scriptBinding->qualifiedId->name->asString() == QLatin1String("target")
+ if (scriptBinding->qualifiedId
+ && scriptBinding->qualifiedId->name == QLatin1String("target")
&& ! scriptBinding->qualifiedId->next) {
Evaluate evaluator(_scopeChain);
const Value *targetValue = evaluator(scriptBinding->statement);
@@ -202,9 +202,9 @@ const Value *ScopeBuilder::scopeObjectLookup(AST::UiQualifiedId *id)
foreach (const ObjectValue *scopeObject, _scopeChain->qmlScopeObjects()) {
const ObjectValue *object = scopeObject;
for (UiQualifiedId *it = id; it; it = it->next) {
- if (!it->name)
+ if (it->name.isEmpty())
return 0;
- result = object->lookupMember(it->name->asString(), _scopeChain->context());
+ result = object->lookupMember(it->name.toString(), _scopeChain->context());
if (!result)
break;
if (it->next) {