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

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source
This commit is contained in:
Alessandro Portale
2009-05-18 11:48:01 +02:00
parent e00f346e7c be620585f1
commit 9f96d80c7b
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/duieditor/duieditor.cpp
View File

@@ -85,6 +85,14 @@ protected:
using Visitor::visit; using Visitor::visit;
using Visitor::endVisit; using Visitor::endVisit;
void addWords(AST::UiQualifiedId *id)
{
for (; id; id = id->next) {
if (id->name)
_words.insert(id->name->asString());
}
}
virtual bool visit(AST::UiPublicMember *node) virtual bool visit(AST::UiPublicMember *node)
{ {
if (node->name) if (node->name)
@@ -93,14 +101,6 @@ protected:
return true; return true;
} }
virtual bool visit(AST::UiObjectDefinition *node)
{
if (node->name)
_words.insert(node->name->asString());
return true;
}
virtual bool visit(AST::UiQualifiedId *node) virtual bool visit(AST::UiQualifiedId *node)
{ {
if (node->name) if (node->name)
@@ -109,14 +109,6 @@ protected:
return true; return true;
} }
virtual bool visit(AST::UiObjectBinding *node)
{
if (node->name)
_words.insert(node->name->asString());
return true;
}
virtual bool visit(AST::IdentifierExpression *node) virtual bool visit(AST::IdentifierExpression *node)
{ {
if (node->name) if (node->name)
@@ -302,8 +294,8 @@ protected:
init(&decl, node); init(&decl, node);
decl.text.fill(QLatin1Char(' '), _depth); decl.text.fill(QLatin1Char(' '), _depth);
if (node->name) if (node->qualifiedObjectNameId)
decl.text.append(node->name->asString()); decl.text.append(asString(node->qualifiedObjectNameId));
else else
decl.text.append(QLatin1Char('?')); decl.text.append(QLatin1Char('?'));
@@ -329,8 +321,8 @@ protected:
decl.text.append(asString(node->qualifiedId)); decl.text.append(asString(node->qualifiedId));
decl.text.append(QLatin1String(": ")); decl.text.append(QLatin1String(": "));
if (node->name) if (node->qualifiedObjectNameId)
decl.text.append(node->name->asString()); decl.text.append(asString(node->qualifiedObjectNameId));
else else
decl.text.append(QLatin1Char('?')); decl.text.append(QLatin1Char('?'));