From be620585f1b741d70df1b97d27b0499160cf3bba Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 18 May 2009 11:21:14 +0200
Subject: [PATCH] Updated the QML editor.
---
src/plugins/duieditor/duieditor.cpp | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/src/plugins/duieditor/duieditor.cpp b/src/plugins/duieditor/duieditor.cpp
index f4b09dcee8c..f6110625ddb 100644
--- a/src/plugins/duieditor/duieditor.cpp
+++ b/src/plugins/duieditor/duieditor.cpp
@@ -85,15 +85,15 @@ protected:
using Visitor::visit;
using Visitor::endVisit;
- virtual bool visit(AST::UiPublicMember *node)
+ void addWords(AST::UiQualifiedId *id)
{
- if (node->name)
- _words.insert(node->name->asString());
-
- return true;
+ for (; id; id = id->next) {
+ if (id->name)
+ _words.insert(id->name->asString());
+ }
}
- virtual bool visit(AST::UiObjectDefinition *node)
+ virtual bool visit(AST::UiPublicMember *node)
{
if (node->name)
_words.insert(node->name->asString());
@@ -109,14 +109,6 @@ protected:
return true;
}
- virtual bool visit(AST::UiObjectBinding *node)
- {
- if (node->name)
- _words.insert(node->name->asString());
-
- return true;
- }
-
virtual bool visit(AST::IdentifierExpression *node)
{
if (node->name)
@@ -302,8 +294,8 @@ protected:
init(&decl, node);
decl.text.fill(QLatin1Char(' '), _depth);
- if (node->name)
- decl.text.append(node->name->asString());
+ if (node->qualifiedObjectNameId)
+ decl.text.append(asString(node->qualifiedObjectNameId));
else
decl.text.append(QLatin1Char('?'));
@@ -329,8 +321,8 @@ protected:
decl.text.append(asString(node->qualifiedId));
decl.text.append(QLatin1String(": "));
- if (node->name)
- decl.text.append(node->name->asString());
+ if (node->qualifiedObjectNameId)
+ decl.text.append(asString(node->qualifiedObjectNameId));
else
decl.text.append(QLatin1Char('?'));
--
GitLab