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

10
src/plugins/qmljseditor/qmljscomponentfromobjectdef.cpp
View File

@@ -57,9 +57,9 @@ static QString toString(Statement *statement)
if (!expStmt)
return QString();
if (IdentifierExpression *idExp = cast<IdentifierExpression *>(expStmt->expression)) {
return idExp->name->asString();
return idExp->name.toString();
} else if (StringLiteral *strExp = cast<StringLiteral *>(expStmt->expression)) {
return strExp->value->asString();
return strExp->value.toString();
}
return QString();
}
@@ -75,10 +75,10 @@ static QString getIdProperty(UiObjectDefinition *def)
continue;
if (script->qualifiedId->next)
continue;
if (script->qualifiedId->name) {
if (script->qualifiedId->name->asString() == QLatin1String("id"))
if (!script->qualifiedId->name.isEmpty()) {
if (script->qualifiedId->name == QLatin1String("id"))
return toString(script->statement);
if (script->qualifiedId->name->asString() == QLatin1String("objectName"))
if (script->qualifiedId->name == QLatin1String("objectName"))
objectName = toString(script->statement);
}
}