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

QmlDesigner: Remove using namespace QmlJS::AST from MoveObjectBeforeObjectVisitor

Browse Source 
Change-Id: Ife1542a61abbd1b323ce1fa46854d9595252f2aa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-07-07 16:51:30 +02:00
committed by Thomas Hartmann
parent 9b475d7f10
commit 3c3003bef0
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.cpp
View File

@@ -34,8 +34,6 @@
#include <QDebug> #include <QDebug>
using namespace QmlJS;
using namespace QmlJS::AST;
using namespace QmlDesigner::Internal; using namespace QmlDesigner::Internal;
using namespace QmlDesigner; using namespace QmlDesigner;
@@ -60,7 +58,7 @@ MoveObjectBeforeObjectVisitor::MoveObjectBeforeObjectVisitor(TextModifier &modif
beforeObjectLocation(beforeObjectLocation) beforeObjectLocation(beforeObjectLocation)
{} {}
bool MoveObjectBeforeObjectVisitor::operator ()(UiProgram *ast) bool MoveObjectBeforeObjectVisitor::operator ()(QmlJS::AST::UiProgram *ast)
{ {
movingObject = 0; movingObject = 0;
beforeObject = 0; beforeObject = 0;
@@ -74,13 +72,13 @@ bool MoveObjectBeforeObjectVisitor::operator ()(UiProgram *ast)
return didRewriting(); return didRewriting();
} }
bool MoveObjectBeforeObjectVisitor::preVisit(Node *ast) bool MoveObjectBeforeObjectVisitor::preVisit(QmlJS::AST::Node *ast)
{ if (ast) parents.push(ast); return true; } { if (ast) parents.push(ast); return true; }
void MoveObjectBeforeObjectVisitor::postVisit(Node *ast) void MoveObjectBeforeObjectVisitor::postVisit(QmlJS::AST::Node *ast)
{ if (ast) parents.pop(); } { if (ast) parents.pop(); }
bool MoveObjectBeforeObjectVisitor::visit(UiObjectDefinition *ast) bool MoveObjectBeforeObjectVisitor::visit(QmlJS::AST::UiObjectDefinition *ast)
{ {
if (foundEverything()) if (foundEverything())
return false; return false;
@@ -110,16 +108,16 @@ void MoveObjectBeforeObjectVisitor::doMove()
Q_ASSERT(!movingObjectParents.isEmpty()); Q_ASSERT(!movingObjectParents.isEmpty());
TextModifier::MoveInfo moveInfo; TextModifier::MoveInfo moveInfo;
Node *parent = movingObjectParent(); QmlJS::AST::Node *parent = movingObjectParent();
UiArrayMemberList *arrayMember = 0, *otherArrayMember = 0; QmlJS::AST::UiArrayMemberList *arrayMember = 0, *otherArrayMember = 0;
QString separator; QString separator;
if (!inDefaultProperty) { if (!inDefaultProperty) {
UiArrayBinding *initializer = cast<UiArrayBinding*>(parent); QmlJS::AST::UiArrayBinding *initializer = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(parent);
Q_ASSERT(initializer); Q_ASSERT(initializer);
otherArrayMember = 0; otherArrayMember = 0;
for (UiArrayMemberList *cur = initializer->members; cur; cur = cur->next) { for (QmlJS::AST::UiArrayMemberList *cur = initializer->members; cur; cur = cur->next) {
if (cur->member == movingObject) { if (cur->member == movingObject) {
arrayMember = cur; arrayMember = cur;
if (cur->next) if (cur->next)
@@ -156,7 +154,7 @@ void MoveObjectBeforeObjectVisitor::doMove()
moveInfo.prefixToInsert = QString(moveInfo.leadingCharsToRemove, QLatin1Char(' ')); moveInfo.prefixToInsert = QString(moveInfo.leadingCharsToRemove, QLatin1Char(' '));
moveInfo.suffixToInsert = separator + QStringLiteral("\n\n"); moveInfo.suffixToInsert = separator + QStringLiteral("\n\n");
} else { } else {
const SourceLocation insertionPoint = lastParentLocation(); const QmlJS::AST::SourceLocation insertionPoint = lastParentLocation();
Q_ASSERT(insertionPoint.isValid()); Q_ASSERT(insertionPoint.isValid());
moveInfo.destination = insertionPoint.offset; moveInfo.destination = insertionPoint.offset;
int dummy = -1; int dummy = -1;
@@ -170,7 +168,7 @@ void MoveObjectBeforeObjectVisitor::doMove()
setDidRewriting(true); setDidRewriting(true);
} }
Node *MoveObjectBeforeObjectVisitor::movingObjectParent() const QmlJS::AST::Node *MoveObjectBeforeObjectVisitor::movingObjectParent() const
{ {
if (movingObjectParents.size() > 1) if (movingObjectParents.size() > 1)
return movingObjectParents.at(movingObjectParents.size() - 2); return movingObjectParents.at(movingObjectParents.size() - 2);
@@ -178,15 +176,15 @@ Node *MoveObjectBeforeObjectVisitor::movingObjectParent() const
return 0; return 0;
} }
SourceLocation MoveObjectBeforeObjectVisitor::lastParentLocation() const QmlJS::AST::SourceLocation MoveObjectBeforeObjectVisitor::lastParentLocation() const
{ {
dump(movingObjectParents); dump(movingObjectParents);
Node *parent = movingObjectParent(); QmlJS::AST::Node *parent = movingObjectParent();
if (UiObjectInitializer *initializer = cast<UiObjectInitializer*>(parent)) if (QmlJS::AST::UiObjectInitializer *initializer = QmlJS::AST::cast<QmlJS::AST::UiObjectInitializer*>(parent))
return initializer->rbraceToken; return initializer->rbraceToken;
else if (UiArrayBinding *initializer = cast<UiArrayBinding*>(parent)) else if (QmlJS::AST::UiArrayBinding *initializer = QmlJS::AST::cast<QmlJS::AST::UiArrayBinding*>(parent))
return initializer->rbracketToken; return initializer->rbracketToken;
else else
return SourceLocation(); return QmlJS::AST::SourceLocation();
} }