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

QmlDesigner: Remove using namespace QmlJS::AST from RemoveUIObjectMemberVisitor

Browse Source 
Change-Id: Ife1542a61abbd1b323ce1fa46854d95de25232aa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-07-07 16:49:31 +02:00
committed by Thomas Hartmann
parent aeb154db74
commit 11ee8adfdc
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.cpp
View File

@@ -36,8 +36,6 @@
using namespace QmlDesigner; using namespace QmlDesigner;
using namespace QmlDesigner::Internal; using namespace QmlDesigner::Internal;
using namespace QmlJS;
using namespace QmlJS::AST;
RemoveUIObjectMemberVisitor::RemoveUIObjectMemberVisitor(TextModifier &modifier, RemoveUIObjectMemberVisitor::RemoveUIObjectMemberVisitor(TextModifier &modifier,
quint32 objectLocation): quint32 objectLocation):
@@ -46,27 +44,27 @@ RemoveUIObjectMemberVisitor::RemoveUIObjectMemberVisitor(TextModifier &modifier,
{ {
} }
bool RemoveUIObjectMemberVisitor::preVisit(Node *ast) bool RemoveUIObjectMemberVisitor::preVisit(QmlJS::AST::Node *ast)
{ {
parents.push(ast); parents.push(ast);
return true; return true;
} }
void RemoveUIObjectMemberVisitor::postVisit(Node *) void RemoveUIObjectMemberVisitor::postVisit(QmlJS::AST::Node *)
{ {
parents.pop(); parents.pop();
} }
bool RemoveUIObjectMemberVisitor::visit(UiPublicMember *ast) { return visitObjectMember(ast); } bool RemoveUIObjectMemberVisitor::visit(QmlJS::AST::UiPublicMember *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(UiObjectDefinition *ast) { return visitObjectMember(ast); } bool RemoveUIObjectMemberVisitor::visit(QmlJS::AST::UiObjectDefinition *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(UiSourceElement *ast) { return visitObjectMember(ast); } bool RemoveUIObjectMemberVisitor::visit(QmlJS::AST::UiSourceElement *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(UiObjectBinding *ast) { return visitObjectMember(ast); } bool RemoveUIObjectMemberVisitor::visit(QmlJS::AST::UiObjectBinding *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(UiScriptBinding *ast) { return visitObjectMember(ast); } bool RemoveUIObjectMemberVisitor::visit(QmlJS::AST::UiScriptBinding *ast) { return visitObjectMember(ast); }
bool RemoveUIObjectMemberVisitor::visit(UiArrayBinding *ast) { return visitObjectMember(ast); } bool RemoveUIObjectMemberVisitor::visit(QmlJS::AST::UiArrayBinding *ast) { return visitObjectMember(ast); }
// FIXME: duplicate code in the QmlJS::Rewriter class, remove this // FIXME: duplicate code in the QmlJS::Rewriter class, remove this
bool RemoveUIObjectMemberVisitor::visitObjectMember(UiObjectMember *ast) bool RemoveUIObjectMemberVisitor::visitObjectMember(QmlJS::AST::UiObjectMember *ast)
{ {
const quint32 memberStart = ast->firstSourceLocation().offset; const quint32 memberStart = ast->firstSourceLocation().offset;
@@ -75,7 +73,7 @@ bool RemoveUIObjectMemberVisitor::visitObjectMember(UiObjectMember *ast)
int start = objectLocation; int start = objectLocation;
int end = ast->lastSourceLocation().end(); int end = ast->lastSourceLocation().end();
if (UiArrayBinding *parentArray = containingArray()) if (QmlJS::AST::UiArrayBinding *parentArray = containingArray())
extendToLeadingOrTrailingComma(parentArray, ast, start, end); extendToLeadingOrTrailingComma(parentArray, ast, start, end);
else else
includeSurroundingWhitespace(start, end); includeSurroundingWhitespace(start, end);
@@ -95,24 +93,24 @@ bool RemoveUIObjectMemberVisitor::visitObjectMember(UiObjectMember *ast)
} }
} }
UiArrayBinding *RemoveUIObjectMemberVisitor::containingArray() const QmlJS::AST::UiArrayBinding *RemoveUIObjectMemberVisitor::containingArray() const
{ {
if (parents.size() > 2) { if (parents.size() > 2) {
if (cast<UiArrayMemberList*>(parents[parents.size() - 2])) if (QmlJS::AST::cast<QmlJS::AST::UiArrayMemberList*>(parents[parents.size() - 2]))
return cast<UiArrayBinding*>(parents[parents.size() - 3]); return QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(parents[parents.size() - 3]);
} }
return 0; return 0;
} }
// FIXME: duplicate code in the QmlJS::Rewriter class, remove this // FIXME: duplicate code in the QmlJS::Rewriter class, remove this
void RemoveUIObjectMemberVisitor::extendToLeadingOrTrailingComma(UiArrayBinding *parentArray, void RemoveUIObjectMemberVisitor::extendToLeadingOrTrailingComma(QmlJS::AST::UiArrayBinding *parentArray,
UiObjectMember *ast, QmlJS::AST::UiObjectMember *ast,
int &start, int &start,
int &end) const int &end) const
{ {
UiArrayMemberList *currentMember = 0; QmlJS::AST::UiArrayMemberList *currentMember = 0;
for (UiArrayMemberList *it = parentArray->members; it; it = it->next) { for (QmlJS::AST::UiArrayMemberList *it = parentArray->members; it; it = it->next) {
if (it->member == ast) { if (it->member == ast) {
currentMember = it; currentMember = it;
break; break;