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: Ife1542a61abbd1b123ce1fa46854d95de252f2ff
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-07-07 16:51:58 +02:00
committed by Thomas Hartmann
parent 3c3003bef0
commit 54a10d2a37
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp
View File

@@ -35,19 +35,17 @@
#include <QDebug> #include <QDebug>
using namespace QmlJS;
using namespace QmlDesigner; using namespace QmlDesigner;
using namespace QmlJS::AST;
FirstDefinitionFinder::FirstDefinitionFinder(const QString &text): FirstDefinitionFinder::FirstDefinitionFinder(const QString &text):
m_doc(Document::create("<internal>", Dialect::Qml)) m_doc(QmlJS::Document::create(QLatin1String("<internal>"), QmlJS::Dialect::Qml))
{ {
m_doc->setSource(text); m_doc->setSource(text);
bool ok = m_doc->parseQml(); bool ok = m_doc->parseQml();
if (!ok) { if (!ok) {
qDebug() << text; qDebug() << text;
foreach (const DiagnosticMessage &message, m_doc->diagnosticMessages()) foreach (const QmlJS::DiagnosticMessage &message, m_doc->diagnosticMessages())
qDebug() << message.message; qDebug() << message.message;
} }
@@ -63,7 +61,7 @@ qint32 FirstDefinitionFinder::operator()(quint32 offset)
m_offset = offset; m_offset = offset;
m_firstObjectDefinition = 0; m_firstObjectDefinition = 0;
Node::accept(m_doc->qmlProgram(), this); QmlJS::AST::Node::accept(m_doc->qmlProgram(), this);
if (!m_firstObjectDefinition) if (!m_firstObjectDefinition)
return -1; return -1;
@@ -71,18 +69,18 @@ qint32 FirstDefinitionFinder::operator()(quint32 offset)
return m_firstObjectDefinition->firstSourceLocation().offset; return m_firstObjectDefinition->firstSourceLocation().offset;
} }
void FirstDefinitionFinder::extractFirstObjectDefinition(UiObjectInitializer* ast) void FirstDefinitionFinder::extractFirstObjectDefinition(QmlJS::AST::UiObjectInitializer* ast)
{ {
if (!ast) if (!ast)
return; return;
for (UiObjectMemberList *iter = ast->members; iter; iter = iter->next) { for (QmlJS::AST::UiObjectMemberList *iter = ast->members; iter; iter = iter->next) {
if (UiObjectDefinition *def = cast<UiObjectDefinition*>(iter->member)) if (QmlJS::AST::UiObjectDefinition *def = QmlJS::AST::cast<QmlJS::AST::UiObjectDefinition*>(iter->member))
m_firstObjectDefinition = def; m_firstObjectDefinition = def;
} }
} }
bool FirstDefinitionFinder::visit(UiObjectBinding *ast) bool FirstDefinitionFinder::visit(QmlJS::AST::UiObjectBinding *ast)
{ {
if (ast->qualifiedTypeNameId && ast->qualifiedTypeNameId->identifierToken.isValid()) { if (ast->qualifiedTypeNameId && ast->qualifiedTypeNameId->identifierToken.isValid()) {
const quint32 start = ast->qualifiedTypeNameId->identifierToken.offset; const quint32 start = ast->qualifiedTypeNameId->identifierToken.offset;
@@ -95,7 +93,7 @@ bool FirstDefinitionFinder::visit(UiObjectBinding *ast)
return true; return true;
} }
bool FirstDefinitionFinder::visit(UiObjectDefinition *ast) bool FirstDefinitionFinder::visit(QmlJS::AST::UiObjectDefinition *ast)
{ {
const quint32 start = ast->firstSourceLocation().offset; const quint32 start = ast->firstSourceLocation().offset;