forked from qt-creator/qt-creator
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
This commit is contained in:
@@ -85,6 +85,14 @@ protected:
|
||||
using Visitor::visit;
|
||||
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)
|
||||
{
|
||||
if (node->name)
|
||||
@@ -93,14 +101,6 @@ protected:
|
||||
return true;
|
||||
}
|
||||
|
||||
virtual bool visit(AST::UiObjectDefinition *node)
|
||||
{
|
||||
if (node->name)
|
||||
_words.insert(node->name->asString());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
virtual bool visit(AST::UiQualifiedId *node)
|
||||
{
|
||||
if (node->name)
|
||||
@@ -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('?'));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user