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

16
src/plugins/qmljstools/qmljslocatordata.cpp
View File

@@ -62,14 +62,14 @@ static QString findId(UiObjectInitializer *initializer)
return QString();
for (UiObjectMemberList *member = initializer->members; member; member = member->next) {
if (UiScriptBinding *script = cast<UiScriptBinding *>(member->member)) {
if (!script->qualifiedId || !script->qualifiedId->name || script->qualifiedId->next)
if (!script->qualifiedId || script->qualifiedId->name.isEmpty() || script->qualifiedId->next)
continue;
if (script->qualifiedId->name->asString() != QLatin1String("id"))
if (script->qualifiedId->name != QLatin1String("id"))
continue;
if (ExpressionStatement *expStmt = cast<ExpressionStatement *>(script->statement)) {
if (IdentifierExpression *identExp = cast<IdentifierExpression *>(expStmt->expression)) {
if (identExp->name)
return identExp->name->asString();
if (!identExp->name.isEmpty())
return identExp->name.toString();
}
}
}
@@ -132,19 +132,19 @@ protected:
bool visit(FunctionExpression *ast)
{
if (!ast->name)
if (ast->name.isEmpty())
return true;
LocatorData::Entry entry = basicEntry(ast->identifierToken);
entry.type = LocatorData::Function;
entry.displayName = ast->name->asString();
entry.displayName = ast->name.toString();
entry.displayName += QLatin1Char('(');
for (FormalParameterList *it = ast->formals; it; it = it->next) {
if (it != ast->formals)
entry.displayName += QLatin1String(", ");
if (it->name)
entry.displayName += it->name->asString();
if (!it->name.isEmpty())
entry.displayName += it->name.toString();
}
entry.displayName += QLatin1Char(')');
entry.symbolName = entry.displayName;