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

QmlJS: Adjust existing code for updated QML parser.

Browse Source 
Change-Id: I153723eeb9973be025daf47e317f7b9d076a3c72
Reviewed-on: http://codereview.qt-project.org/4733
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Christian Kamm
2011-09-13 09:57:24 +02:00
parent b531209002
commit 4b2f42cf87
30 changed files with 234 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmljseditor/qmljssemantichighlighter.cpp
View File

@@ -168,19 +168,19 @@ protected:
{
if (!m_inStateType)
return false;
if (!ast->qualifiedId || ! ast->qualifiedId->name || ast->qualifiedId->next)
if (!ast->qualifiedId || ast->qualifiedId->name.isEmpty() || ast->qualifiedId->next)
return false;
if (ast->qualifiedId->name->asString() != QLatin1String("name"))
if (ast->qualifiedId->name != QLatin1String("name"))
return false;
ExpressionStatement *expStmt = cast<ExpressionStatement *>(ast->statement);
if (!expStmt)
return false;
StringLiteral *strLit = cast<StringLiteral *>(expStmt->expression);
if (!strLit || !strLit->value)
if (!strLit || strLit->value.isEmpty())
return false;
m_stateNames += strLit->value->asString();
m_stateNames += strLit->value.toString();
return false;
}
@@ -211,12 +211,12 @@ protected:
m_scopeBuilder.pop();
}
void processName(NameId *name, SourceLocation location)
void processName(const QStringRef &name, SourceLocation location)
{
if (!name)
if (name.isEmpty())
return;
const QString nameStr = name->asString();
const QString &nameStr = name.toString();
const ObjectValue *scope = 0;
const Value *value = m_scopeChain.lookup(nameStr, &scope);
if (!value || !scope)
@@ -299,10 +299,10 @@ protected:
bool visit(StringLiteral *ast)
{
if (!ast->value)
if (ast->value.isEmpty())
return false;
const QString value = ast->value->asString();
const QString &value = ast->value.toString();
if (m_stateNames.contains(value)) {
addUse(ast->literalToken, SemanticHighlighter::LocalStateNameType);
}