From f9a0f9abd9acb0f35287a357ee6e1dba3d4d72b9 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 7 Jul 2015 16:50:36 +0200 Subject: [PATCH] QmlDesigner: Remove using namespace QmlJS::AST from QMLRewriter Change-Id: Ife1552a666bbd1b333ce1fa46854d95de252f2a8 Reviewed-by: Tim Jenssen --- .../designercore/filemanager/qmlrewriter.cpp | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp index a5514593838..599008143cc 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp @@ -37,8 +37,6 @@ #include -using namespace QmlJS; -using namespace QmlJS::AST; using namespace QmlDesigner::Internal; QMLRewriter::QMLRewriter(QmlDesigner::TextModifier &textModifier): @@ -47,11 +45,11 @@ QMLRewriter::QMLRewriter(QmlDesigner::TextModifier &textModifier): { } -bool QMLRewriter::operator()(UiProgram *ast) +bool QMLRewriter::operator()(QmlJS::AST::UiProgram *ast) { setDidRewriting(false); - Node::accept(ast, this); + QmlJS::AST::Node::accept(ast, this); return didRewriting(); } @@ -71,12 +69,12 @@ QString QMLRewriter::textBetween(int startPosition, int endPosition) const return m_textModifier->text().mid(startPosition, endPosition - startPosition); } -QString QMLRewriter::textAt(const SourceLocation &location) const +QString QMLRewriter::textAt(const QmlJS::AST::SourceLocation &location) const { return m_textModifier->text().mid(location.offset, location.length); } -unsigned QMLRewriter::calculateIndentDepth(const SourceLocation &position) const +unsigned QMLRewriter::calculateIndentDepth(const QmlJS::AST::SourceLocation &position) const { QTextDocument *doc = m_textModifier->textDocument(); QTextCursor tc(doc); @@ -154,41 +152,41 @@ QString QMLRewriter::removeIndentation(const QString &text, unsigned depth) return result; } -SourceLocation QMLRewriter::calculateLocation(UiQualifiedId *id) +QmlJS::AST::SourceLocation QMLRewriter::calculateLocation(QmlJS::AST::UiQualifiedId *id) { Q_ASSERT(id != 0); - const SourceLocation startLocation = id->identifierToken; + const QmlJS::AST::SourceLocation startLocation = id->identifierToken; - UiQualifiedId *nextId = id; + QmlJS::AST::UiQualifiedId *nextId = id; while (nextId->next) { nextId = nextId->next; } - const SourceLocation endLocation = nextId->identifierToken; + const QmlJS::AST::SourceLocation endLocation = nextId->identifierToken; - return SourceLocation(startLocation.offset, endLocation.end() - startLocation.offset); + return QmlJS::AST::SourceLocation(startLocation.offset, endLocation.end() - startLocation.offset); } -bool QMLRewriter::isMissingSemicolon(UiObjectMember *member) +bool QMLRewriter::isMissingSemicolon(QmlJS::AST::UiObjectMember *member) { - UiScriptBinding *binding = AST::cast(member); + QmlJS::AST::UiScriptBinding *binding = QmlJS::AST::cast(member); if (binding) return isMissingSemicolon(binding->statement); else return false; } -bool QMLRewriter::isMissingSemicolon(Statement *stmt) +bool QMLRewriter::isMissingSemicolon(QmlJS::AST::Statement *stmt) { - if (ExpressionStatement *eStmt = AST::cast(stmt)) { + if (QmlJS::AST::ExpressionStatement *eStmt = QmlJS::AST::cast(stmt)) { return !eStmt->semicolonToken.isValid(); - } else if (IfStatement *iStmt = AST::cast(stmt)) { + } else if (QmlJS::AST::IfStatement *iStmt = QmlJS::AST::cast(stmt)) { if (iStmt->elseToken.isValid()) return isMissingSemicolon(iStmt->ko); else return isMissingSemicolon(iStmt->ok); - } else if (DebuggerStatement *dStmt = AST::cast(stmt)) { + } else if (QmlJS::AST::DebuggerStatement *dStmt = QmlJS::AST::cast(stmt)) { return !dStmt->semicolonToken.isValid(); } else { return false; @@ -262,26 +260,26 @@ void QMLRewriter::includeLeadingEmptyLine(int &start) const } // FIXME: duplicate code in the QmlJS::Rewriter class, remove this -UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *members, const QmlDesigner::PropertyNameList &propertyOrder) +QmlJS::AST::UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(QmlJS::AST::UiObjectMemberList *members, const QmlDesigner::PropertyNameList &propertyOrder) { const int objectDefinitionInsertionPoint = propertyOrder.indexOf(PropertyName()); // XXX ???? - UiObjectMemberList *lastObjectDef = 0; - UiObjectMemberList *lastNonObjectDef = 0; + QmlJS::AST::UiObjectMemberList *lastObjectDef = 0; + QmlJS::AST::UiObjectMemberList *lastNonObjectDef = 0; - for (UiObjectMemberList *iter = members; iter; iter = iter->next) { - UiObjectMember *member = iter->member; + for (QmlJS::AST::UiObjectMemberList *iter = members; iter; iter = iter->next) { + QmlJS::AST::UiObjectMember *member = iter->member; int idx = -1; - if (cast(member)) + if (QmlJS::AST::cast(member)) lastObjectDef = iter; - else if (UiArrayBinding *arrayBinding = cast(member)) + else if (QmlJS::AST::UiArrayBinding *arrayBinding = QmlJS::AST::cast(member)) idx = propertyOrder.indexOf(toString(arrayBinding->qualifiedId).toUtf8()); - else if (UiObjectBinding *objectBinding = cast(member)) + else if (QmlJS::AST::UiObjectBinding *objectBinding = QmlJS::AST::cast(member)) idx = propertyOrder.indexOf(toString(objectBinding->qualifiedId).toUtf8()); - else if (UiScriptBinding *scriptBinding = cast(member)) + else if (QmlJS::AST::UiScriptBinding *scriptBinding = QmlJS::AST::cast(member)) idx = propertyOrder.indexOf(toString(scriptBinding->qualifiedId).toUtf8()); - else if (cast(member)) + else if (QmlJS::AST::cast(member)) idx = propertyOrder.indexOf("property"); if (idx < objectDefinitionInsertionPoint) @@ -295,25 +293,27 @@ UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *m } // FIXME: duplicate code in the QmlJS::Rewriter class, remove this -UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *members, const QmlDesigner::PropertyName &propertyName, const QmlDesigner::PropertyNameList &propertyOrder) +QmlJS::AST::UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(QmlJS::AST::UiObjectMemberList *members, + const QmlDesigner::PropertyName &propertyName, + const QmlDesigner::PropertyNameList &propertyOrder) { if (!members) return 0; // empty members - QHash orderedMembers; + QHash orderedMembers; - for (UiObjectMemberList *iter = members; iter; iter = iter->next) { - UiObjectMember *member = iter->member; + for (QmlJS::AST::UiObjectMemberList *iter = members; iter; iter = iter->next) { + QmlJS::AST::UiObjectMember *member = iter->member; - if (UiArrayBinding *arrayBinding = cast(member)) + if (QmlJS::AST::UiArrayBinding *arrayBinding = QmlJS::AST::cast(member)) orderedMembers[toString(arrayBinding->qualifiedId)] = iter; - else if (UiObjectBinding *objectBinding = cast(member)) + else if (QmlJS::AST::UiObjectBinding *objectBinding = QmlJS::AST::cast(member)) orderedMembers[toString(objectBinding->qualifiedId)] = iter; - else if (cast(member)) + else if (QmlJS::AST::cast(member)) orderedMembers[QString::null] = iter; - else if (UiScriptBinding *scriptBinding = cast(member)) + else if (QmlJS::AST::UiScriptBinding *scriptBinding = QmlJS::AST::cast(member)) orderedMembers[toString(scriptBinding->qualifiedId)] = iter; - else if (cast(member)) + else if (QmlJS::AST::cast(member)) orderedMembers[QStringLiteral("property")] = iter; } @@ -325,7 +325,7 @@ UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *m for (; idx > 0; --idx) { const QString prop = propertyOrder.at(idx - 1); - UiObjectMemberList *candidate = orderedMembers.value(prop, 0); + QmlJS::AST::UiObjectMemberList *candidate = orderedMembers.value(prop, 0); if (candidate != 0) return candidate; }