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

QmlDesigner: Remove using namespace QmlJS::AST from ChangeImportsVisitor

Browse Source 
Change-Id: Ife1542a61bbbdbb323ce1fa46854d95de252f2a8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-07-07 16:52:49 +02:00
committed by Thomas Hartmann
parent ff54bc0b5f
commit 056c4db900
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.cpp
View File

@@ -32,10 +32,6 @@
#include <qmljs/parser/qmljsast_p.h> #include <qmljs/parser/qmljsast_p.h>
using namespace QmlJS;
using namespace QmlJS::AST;
using namespace QmlDesigner; using namespace QmlDesigner;
using namespace QmlDesigner::Internal; using namespace QmlDesigner::Internal;
@@ -44,7 +40,7 @@ ChangeImportsVisitor::ChangeImportsVisitor(TextModifier &textModifier,
QMLRewriter(textModifier), m_source(source) QMLRewriter(textModifier), m_source(source)
{} {}
bool ChangeImportsVisitor::add(UiProgram *ast, const Import &import) bool ChangeImportsVisitor::add(QmlJS::AST::UiProgram *ast, const Import &import)
{ {
setDidRewriting(false); setDidRewriting(false);
if (!ast) if (!ast)
@@ -72,14 +68,14 @@ bool ChangeImportsVisitor::add(UiProgram *ast, const Import &import)
return true; return true;
} }
bool ChangeImportsVisitor::remove(UiProgram *ast, const Import &import) bool ChangeImportsVisitor::remove(QmlJS::AST::UiProgram *ast, const Import &import)
{ {
setDidRewriting(false); setDidRewriting(false);
if (!ast) if (!ast)
return false; return false;
for (UiHeaderItemList *iter = ast->headers; iter; iter = iter->next) { for (QmlJS::AST::UiHeaderItemList *iter = ast->headers; iter; iter = iter->next) {
UiImport *iterImport = AST::cast<UiImport *>(iter->headerItem); QmlJS::AST::UiImport *iterImport = QmlJS::AST::cast<QmlJS::AST::UiImport *>(iter->headerItem);
if (equals(iterImport, import)) { if (equals(iterImport, import)) {
int start = iterImport->firstSourceLocation().begin(); int start = iterImport->firstSourceLocation().begin();
int end = iterImport->lastSourceLocation().end(); int end = iterImport->lastSourceLocation().end();
@@ -92,7 +88,7 @@ bool ChangeImportsVisitor::remove(UiProgram *ast, const Import &import)
return didRewriting(); return didRewriting();
} }
bool ChangeImportsVisitor::equals(UiImport *ast, const Import &import) bool ChangeImportsVisitor::equals(QmlJS::AST::UiImport *ast, const Import &import)
{ {
if (import.isLibraryImport()) if (import.isLibraryImport())
return toString(ast->importUri) == import.url(); return toString(ast->importUri) == import.url();