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

QmlDesigner: Remove using namespace QmlJS::AST from AddArrayMemberVisitor

Browse Source 
Change-Id: Ife1542a61abbd1b323ce1fa46854d95de252f2a8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-07-07 16:47:01 +02:00
committed by Thomas Hartmann
parent 2d6399383b
commit d31e77be26
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.cpp
View File

@@ -34,8 +34,6 @@
using namespace QmlDesigner; using namespace QmlDesigner;
using namespace QmlDesigner::Internal; using namespace QmlDesigner::Internal;
using namespace QmlJS;
using namespace QmlJS::AST;
AddArrayMemberVisitor::AddArrayMemberVisitor(TextModifier &modifier, AddArrayMemberVisitor::AddArrayMemberVisitor(TextModifier &modifier,
quint32 parentLocation, quint32 parentLocation,
@@ -49,20 +47,20 @@ AddArrayMemberVisitor::AddArrayMemberVisitor(TextModifier &modifier,
{ {
} }
void AddArrayMemberVisitor::findArrayBindingAndInsert(const QString &propertyName, UiObjectMemberList *ast) void AddArrayMemberVisitor::findArrayBindingAndInsert(const QString &propertyName, QmlJS::AST::UiObjectMemberList *ast)
{ {
for (UiObjectMemberList *iter = ast; iter; iter = iter->next) { for (QmlJS::AST::UiObjectMemberList *iter = ast; iter; iter = iter->next) {
if (UiArrayBinding *arrayBinding = cast<UiArrayBinding*>(iter->member)) { if (QmlJS::AST::UiArrayBinding *arrayBinding = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(iter->member)) {
if (toString(arrayBinding->qualifiedId) == propertyName) if (toString(arrayBinding->qualifiedId) == propertyName)
insertInto(arrayBinding); insertInto(arrayBinding);
} else if (UiObjectBinding *objectBinding = cast<UiObjectBinding*>(iter->member)) { } else if (QmlJS::AST::UiObjectBinding *objectBinding = QmlJS::AST::cast<QmlJS::AST::UiObjectBinding*>(iter->member)) {
if (toString(objectBinding->qualifiedId) == propertyName && willConvertObjectBindingIntoArrayBinding()) if (toString(objectBinding->qualifiedId) == propertyName && willConvertObjectBindingIntoArrayBinding())
convertAndAdd(objectBinding); convertAndAdd(objectBinding);
} }
} }
} }
bool AddArrayMemberVisitor::visit(UiObjectBinding *ast) bool AddArrayMemberVisitor::visit(QmlJS::AST::UiObjectBinding *ast)
{ {
if (didRewriting()) if (didRewriting())
return false; return false;
@@ -73,7 +71,7 @@ bool AddArrayMemberVisitor::visit(UiObjectBinding *ast)
return !didRewriting(); return !didRewriting();
} }
bool AddArrayMemberVisitor::visit(UiObjectDefinition *ast) bool AddArrayMemberVisitor::visit(QmlJS::AST::UiObjectDefinition *ast)
{ {
if (didRewriting()) if (didRewriting())
return false; return false;
@@ -85,10 +83,10 @@ bool AddArrayMemberVisitor::visit(UiObjectDefinition *ast)
} }
// FIXME: duplicate code in the QmlJS::Rewriter class, remove this // FIXME: duplicate code in the QmlJS::Rewriter class, remove this
void AddArrayMemberVisitor::insertInto(UiArrayBinding *arrayBinding) void AddArrayMemberVisitor::insertInto(QmlJS::AST::UiArrayBinding *arrayBinding)
{ {
UiObjectMember *lastMember = 0; QmlJS::AST::UiObjectMember *lastMember = 0;
for (UiArrayMemberList *iter = arrayBinding->members; iter; iter = iter->next) for (QmlJS::AST::UiArrayMemberList *iter = arrayBinding->members; iter; iter = iter->next)
if (iter->member) if (iter->member)
lastMember = iter->member; lastMember = iter->member;
@@ -103,7 +101,7 @@ void AddArrayMemberVisitor::insertInto(UiArrayBinding *arrayBinding)
setDidRewriting(true); setDidRewriting(true);
} }
void AddArrayMemberVisitor::convertAndAdd(UiObjectBinding *objectBinding) void AddArrayMemberVisitor::convertAndAdd(QmlJS::AST::UiObjectBinding *objectBinding)
{ {
const int indentDepth = calculateIndentDepth(objectBinding->firstSourceLocation()); const int indentDepth = calculateIndentDepth(objectBinding->firstSourceLocation());
const QString arrayPrefix = QStringLiteral("[\n") + addIndentation(QString(), indentDepth); const QString arrayPrefix = QStringLiteral("[\n") + addIndentation(QString(), indentDepth);