From 2d6399383b2e81ef184a6e89d7d1139e8ac85161 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 7 Jul 2015 16:53:46 +0200 Subject: [PATCH] QmlDesigner: Remove using namespace QmlJS::AST from AddObjectVisitor Change-Id: Ife1542a61abbd1b323ce1fa46854d95de234f2aa Reviewed-by: Tim Jenssen --- .../designercore/filemanager/addobjectvisitor.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp index 39a320038e3..559bb129917 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.cpp @@ -34,10 +34,8 @@ using namespace QmlDesigner; using namespace QmlDesigner::Internal; -using namespace QmlJS; -using namespace QmlJS::AST; -AddObjectVisitor::AddObjectVisitor(TextModifier &modifier, +AddObjectVisitor::AddObjectVisitor(QmlDesigner::TextModifier &modifier, quint32 parentLocation, const QString &content, const PropertyNameList &propertyOrder): @@ -48,7 +46,7 @@ AddObjectVisitor::AddObjectVisitor(TextModifier &modifier, { } -bool AddObjectVisitor::visit(UiObjectBinding *ast) +bool AddObjectVisitor::visit(QmlJS::AST::UiObjectBinding *ast) { if (didRewriting()) return false; @@ -59,7 +57,7 @@ bool AddObjectVisitor::visit(UiObjectBinding *ast) return !didRewriting(); } -bool AddObjectVisitor::visit(UiObjectDefinition *ast) +bool AddObjectVisitor::visit(QmlJS::AST::UiObjectDefinition *ast) { if (didRewriting()) return false; @@ -71,9 +69,9 @@ bool AddObjectVisitor::visit(UiObjectDefinition *ast) } // FIXME: duplicate code in the QmlJS::Rewriter class, remove this -void AddObjectVisitor::insertInto(UiObjectInitializer *ast) +void AddObjectVisitor::insertInto(QmlJS::AST::UiObjectInitializer *ast) { - UiObjectMemberList *insertAfter = searchMemberToInsertAfter(ast->members, m_propertyOrder); + QmlJS::AST::UiObjectMemberList *insertAfter = searchMemberToInsertAfter(ast->members, m_propertyOrder); int insertionPoint; int depth;